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/dhclient-script-drop-resolv.conf.dhclient.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/dhclient-script-drop-resolv.conf.dhclient.patch')
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch b/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch deleted file mode 100644 index 96095a5e08..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | dhcp-client: fix invoke dhclient-script failed on Read-only file system | ||
2 | |||
3 | In read-only file system, '/etc' is on the readonly partition, | ||
4 | and '/etc/resolv.conf' is symlinked to a separate writable | ||
5 | partition. | ||
6 | |||
7 | In this situation, we should use shell variable to instead of | ||
8 | temp files '/etc/resolv.conf.dhclient' and '/etc/resolv.conf.dhclient6'. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
12 | --- | ||
13 | client/scripts/linux | 20 +++++++++----------- | ||
14 | 1 file changed, 9 insertions(+), 11 deletions(-) | ||
15 | |||
16 | diff --git a/client/scripts/linux b/client/scripts/linux | ||
17 | --- a/client/scripts/linux | ||
18 | +++ b/client/scripts/linux | ||
19 | @@ -27,27 +27,25 @@ ip=/sbin/ip | ||
20 | |||
21 | make_resolv_conf() { | ||
22 | if [ x"$new_domain_name_servers" != x ]; then | ||
23 | - cat /dev/null > /etc/resolv.conf.dhclient | ||
24 | - chmod 644 /etc/resolv.conf.dhclient | ||
25 | + resolv_conf="" | ||
26 | if [ x"$new_domain_search" != x ]; then | ||
27 | - echo search $new_domain_search >> /etc/resolv.conf.dhclient | ||
28 | + resolv_conf="search ${new_domain_search}\n" | ||
29 | elif [ x"$new_domain_name" != x ]; then | ||
30 | # Note that the DHCP 'Domain Name Option' is really just a domain | ||
31 | # name, and that this practice of using the domain name option as | ||
32 | # a search path is both nonstandard and deprecated. | ||
33 | - echo search $new_domain_name >> /etc/resolv.conf.dhclient | ||
34 | + resolv_conf="search ${new_domain_name}\n" | ||
35 | fi | ||
36 | for nameserver in $new_domain_name_servers; do | ||
37 | - echo nameserver $nameserver >>/etc/resolv.conf.dhclient | ||
38 | + resolv_conf="${resolv_conf}nameserver ${nameserver}\n" | ||
39 | done | ||
40 | |||
41 | - mv /etc/resolv.conf.dhclient /etc/resolv.conf | ||
42 | + echo -e "${resolv_conf}" > /etc/resolv.conf | ||
43 | elif [ "x${new_dhcp6_name_servers}" != x ] ; then | ||
44 | - cat /dev/null > /etc/resolv.conf.dhclient6 | ||
45 | - chmod 644 /etc/resolv.conf.dhclient6 | ||
46 | + resolv_conf="" | ||
47 | |||
48 | if [ "x${new_dhcp6_domain_search}" != x ] ; then | ||
49 | - echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 | ||
50 | + resolv_conf="search ${new_dhcp6_domain_search}\n" | ||
51 | fi | ||
52 | shopt -s nocasematch | ||
53 | for nameserver in ${new_dhcp6_name_servers} ; do | ||
54 | @@ -59,11 +57,11 @@ make_resolv_conf() { | ||
55 | else | ||
56 | zone_id= | ||
57 | fi | ||
58 | - echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6 | ||
59 | + resolv_conf="${resolv_conf}nameserver ${nameserver}$zone_id\n" | ||
60 | done | ||
61 | shopt -u nocasematch | ||
62 | |||
63 | - mv /etc/resolv.conf.dhclient6 /etc/resolv.conf | ||
64 | + echo -e "${resolv_conf}" > /etc/resolv.conf | ||
65 | fi | ||
66 | } | ||
67 | |||
68 | -- | ||
69 | 2.8.1 | ||
70 | |||