Patchwork [1/1] dhcp-client: fix invoke dhclient-script failed on Read-only file system

login
register
mail settings
Submitter Hongxu Jia
Date March 5, 2014, 8:52 a.m.
Message ID <5dd65618f76bdc0e159bd98762a5ea9f639223be.1394009171.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/68021/
State New
Headers show

Comments

Hongxu Jia - March 5, 2014, 8:52 a.m.
In read-only file system, '/etc' is on the readonly partition,
and '/etc/resolv.conf' is symlinked to a separate writable
partition.

In this situation, we should use shell variable to instead of
the temp file '/etc/resolv.conf.dhclient'.

[YOCTO #5624]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 ...dhclient-script-drop-resolv.conf.dhclient.patch | 70 ++++++++++++++++++++++
 meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb    |  3 +-
 2 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
Hongxu Jia - March 5, 2014, 9:08 a.m.
On 03/05/2014 04:52 PM, Hongxu Jia wrote:
> In read-only file system, '/etc' is on the readonly partition,
> and '/etc/resolv.conf' is symlinked to a separate writable
> partition.
>
> In this situation, we should use shell variable to instead of
> the temp file '/etc/resolv.conf.dhclient'.
>
> [YOCTO #5624]
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>   ...dhclient-script-drop-resolv.conf.dhclient.patch | 70 ++++++++++++++++++++++
>   meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb    |  3 +-
>   2 files changed, 71 insertions(+), 2 deletions(-)
>   create mode 100644 meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
>
> 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
> new file mode 100644
> index 0000000..99ad91c
> --- /dev/null
> +++ b/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
> @@ -0,0 +1,70 @@
> +dhclient-script: drop resolv.conf.dhclient
> +
> +Even though '/etc' is on the readonly partition, it's possible that
> +/etc/resolv.conf is on a separate writable partition.
> +
> +In this situation, we should drop the temp file resolv.conf.dhclient,
> +use shell variable instead.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> +---
> + client/scripts/linux | 18 +++++++++---------
> + 1 file changed, 9 insertions(+), 9 deletions(-)
> +
> +diff --git a/client/scripts/linux b/client/scripts/linux
> +index 6f8ea4b..b369bef 100755
> +--- a/client/scripts/linux
> ++++ b/client/scripts/linux
> +@@ -27,27 +27,27 @@ ip=/sbin/ip
> +
> + make_resolv_conf() {
> +   if [ x"$new_domain_name_servers" != x ]; then
> +-    cat /dev/null > /etc/resolv.conf.dhclient
> +-    chmod 644 /etc/resolv.conf.dhclient
> ++    resolv_conf=""
> +     if [ x"$new_domain_search" != x ]; then
> +-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
> ++      resolv_conf="search ${new_domain_search}\n"
> +     elif [ x"$new_domain_name" != x ]; then
> +       # Note that the DHCP 'Domain Name Option' is really just a domain
> +       # name, and that this practice of using the domain name option as
> +       # a search path is both nonstandard and deprecated.
> +-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
> ++      resolv_conf="search ${new_domain_name}\n"
> +     fi
> +     for nameserver in $new_domain_name_servers; do
> +-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
> ++      resolv_conf="${resolv_conf}nameserver ${nameserver}\n"
> +     done
> +
> +-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
> ++    echo -e "${resolv_conf}" > /etc/resolv.conf
> +   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
> +     cat /dev/null > /etc/resolv.conf.dhclient6
> +     chmod 644 /etc/resolv.conf.dhclient6

The above two calling should be removed,
Sorry for the missing.

I have updated 
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-dhcpclient
Not resend V4.

//Hongxu

> ++    resolv_conf=""
> +
> +     if [ "x${new_dhcp6_domain_search}" != x ] ; then
> +-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
> ++      resolv_conf="search ${new_dhcp6_domain_search}\n"
> +     fi
> +     shopt -s nocasematch
> +     for nameserver in ${new_dhcp6_name_servers} ; do
> +@@ -59,11 +59,11 @@ make_resolv_conf() {
> +       else
> + 	zone_id=
> +       fi
> +-      echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
> ++      resolv_conf="${resolv_conf}nameserver ${nameserver}$zone_id\n"
> +     done
> +     shopt -u nocasematch
> +
> +-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
> ++    echo -e "${resolv_conf}" > /etc/resolv.conf
> +   fi
> + }
> +
> +--
> +1.8.1.2
> +
> diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb
> index 08db41b..d823350 100644
> --- a/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb
> +++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb
> @@ -1,11 +1,10 @@
>   require dhcp.inc
>   
> -PR = "r1"
> -
>   SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
>               file://fix-external-bind.patch \
>               file://link-with-lcrypto.patch \
>               file://fixsepbuild.patch \
> +            file://dhclient-script-drop-resolv.conf.dhclient.patch \
>              "
>   
>   SRC_URI[md5sum] = "f68e3c1f00a9af5742bc5e71d567cf93"

Patch

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
new file mode 100644
index 0000000..99ad91c
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
@@ -0,0 +1,70 @@ 
+dhclient-script: drop resolv.conf.dhclient
+
+Even though '/etc' is on the readonly partition, it's possible that
+/etc/resolv.conf is on a separate writable partition.
+
+In this situation, we should drop the temp file resolv.conf.dhclient,
+use shell variable instead.
+
+Upstream-Status: Pending
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ client/scripts/linux | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/client/scripts/linux b/client/scripts/linux
+index 6f8ea4b..b369bef 100755
+--- a/client/scripts/linux
++++ b/client/scripts/linux
+@@ -27,27 +27,27 @@ ip=/sbin/ip
+ 
+ make_resolv_conf() {
+   if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    chmod 644 /etc/resolv.conf.dhclient
++    resolv_conf=""
+     if [ x"$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
++      resolv_conf="search ${new_domain_search}\n"
+     elif [ x"$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      resolv_conf="search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++      resolv_conf="${resolv_conf}nameserver ${nameserver}\n"
+     done
+ 
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
++    echo -e "${resolv_conf}" > /etc/resolv.conf
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+     cat /dev/null > /etc/resolv.conf.dhclient6
+     chmod 644 /etc/resolv.conf.dhclient6
++    resolv_conf=""
+ 
+     if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++      resolv_conf="search ${new_dhcp6_domain_search}\n"
+     fi
+     shopt -s nocasematch 
+     for nameserver in ${new_dhcp6_name_servers} ; do
+@@ -59,11 +59,11 @@ make_resolv_conf() {
+       else
+ 	zone_id=
+       fi
+-      echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
++      resolv_conf="${resolv_conf}nameserver ${nameserver}$zone_id\n"
+     done
+     shopt -u nocasematch 
+ 
+-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++    echo -e "${resolv_conf}" > /etc/resolv.conf
+   fi
+ }
+ 
+-- 
+1.8.1.2
+
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb
index 08db41b..d823350 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb
@@ -1,11 +1,10 @@ 
 require dhcp.inc
 
-PR = "r1"
-
 SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
             file://fix-external-bind.patch \
             file://link-with-lcrypto.patch \
             file://fixsepbuild.patch \
+            file://dhclient-script-drop-resolv.conf.dhclient.patch \
            "
 
 SRC_URI[md5sum] = "f68e3c1f00a9af5742bc5e71d567cf93"