diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2017-08-16 04:31:17 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-18 10:40:26 +0100 |
commit | a02826add027f71d1fca56547b2b72db28b1005f (patch) | |
tree | f42f5c26ea1ee6f5c67a79e08184df197bb4db71 /meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch | |
parent | 5552c856a7dc05cb9ef5da8c0cdac63bbef4e8de (diff) | |
download | poky-a02826add027f71d1fca56547b2b72db28b1005f.tar.gz |
dhcp: 4.3.5 -> 4.3.6
1. Rebase patches to 4.3.6
- define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch -> 0001
- dhcp-3.0.3-dhclient-dbus.patch -> 0002
- link-with-lcrypto.patch -> 0003
- fixsepbuild.patch -> 0004
- dhclient-script-drop-resolv.conf.dhclient.patch -> 0005
- 0001-site.h-enable-gentle-shutdown.patch -> 0006
- libxml2-configure-argument.patch -> 0007
- tweak-to-support-external-bind.patch -> 0008
- remove-dhclient-script-bash-dependency.patch -> 0009
- build-shared-libs.patch -> 0010
- Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch -> 0011
2. Drop search-for-libxml2.patch
It is overrided by libxml2-configure-argument.patch
3. Rework dhclient-script-drop-resolv.conf.dhclient.patch and
Drop replace-ifconfig-route.patch.
vim client/scripts/linux
...
Script refresh in 2017. The aliasing code was too convoluted and needs
to go away. Migrated DHCPv4 script to ip command from iproute2 suite.
This is based on Debian script with some tweaks. ifconfig is no longer
used. Everything is done using ip tool from ip-route2.
...
(From OE-Core rev: 77878d2e6e8f36afa9a0fde8a6f0f955c84a5e5c)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch')
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch b/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch new file mode 100644 index 0000000000..dd56381b1d --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 2e8ff0e4f6d39e346ea86b8c514ab4ccc78fa359 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Tue, 15 Aug 2017 15:24:14 +0800 | ||
4 | Subject: [PATCH 05/11] dhcp-client: fix invoke dhclient-script failed on | ||
5 | Read-only file system | ||
6 | |||
7 | In read-only file system, '/etc' is on the readonly partition, | ||
8 | and '/etc/resolv.conf' is symlinked to a separate writable | ||
9 | partition. | ||
10 | |||
11 | In this situation, we create temp files 'resolv.conf.dhclient-new' | ||
12 | in /tmp dir. | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
17 | --- | ||
18 | client/scripts/linux | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/client/scripts/linux b/client/scripts/linux | ||
22 | index 3d447b6..3122a75 100755 | ||
23 | --- a/client/scripts/linux | ||
24 | +++ b/client/scripts/linux | ||
25 | @@ -40,7 +40,7 @@ make_resolv_conf() { | ||
26 | # DHCPv4 | ||
27 | if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] || | ||
28 | [ -n "$new_domain_name_servers" ]; then | ||
29 | - new_resolv_conf=/etc/resolv.conf.dhclient-new | ||
30 | + new_resolv_conf=/tmp/resolv.conf.dhclient-new | ||
31 | rm -f $new_resolv_conf | ||
32 | |||
33 | if [ -n "$new_domain_name" ]; then | ||
34 | -- | ||
35 | 1.8.3.1 | ||
36 | |||