Merge lp:~roadmr/ubuntu/precise/casper/973794 into lp:ubuntu/precise/casper

[Daniel Manrique]

In order to address bug 973794, this code replaces trying to parse and clean up the /tmp/net-${DEVICE}.conf file with simply sourcing the file and using the resulting, now properly-unquoted, environment variables.

See this merge request for a more detailed discussion and Colin Watson's hint that the above is The Way (tm) to handle these files.

https://code.launchpad.net/~roadmr/ubuntu/oneiric/casper/809885/+merge/67868

[Stéphane Graber (stgraber)]

Rejecting the branch as the bug has been fixed in a different way.

Thanks

Unmerged revisions

1011. By Daniel Manrique on 2012-04-04

scripts/casper-bottom/23networking: source file written by ipconfig and
use the resulting environment variables to build resolv.conf, avoids stray
single-quote in 'domain' entry (LP: #973794).

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-03 01:36:50 +0000
+++ debian/changelog	2012-04-04 23:16:34 +0000
@@ -1,9 +1,15 @@
 casper (1.314) precise; urgency=low
 
+  [ Luke Yelavich ]
   * bin/casper-a11y-enable: Call dbus-send with the --print-reply command-line
     argument, and send the output to null, as we don't need it. For some
     reason dbus-send only executes our commands when --print-reply is given.
 
+  [ Daniel Manrique ]
+  * scripts/casper-bottom/23networking: source file written by ipconfig and
+    use the resulting environment variables to build resolv.conf, avoids stray
+    single-quote in 'domain' entry (LP: #973794).
+
  -- Luke Yelavich <[e-mail]>  Tue, 03 Apr 2012 11:36:32 +1000
 
 casper (1.313) precise; urgency=low

=== modified file 'scripts/casper-bottom/23networking'
--- scripts/casper-bottom/23networking	2012-03-05 20:38:22 +0000
+++ scripts/casper-bottom/23networking	2012-04-04 23:16:34 +0000
@@ -77,17 +77,16 @@
         if [ -n "${DEVICE}" ] && [ -e /tmp/net-"${DEVICE}".conf ]; then
             # create a resolv.conf if it is not present
             cp /tmp/net-"${DEVICE}".conf /root/var/log/netboot.config
-            #ipconfig quotes DNSDOMAIN, quotes need to be removed for a correct resolv.conf
-            rc_search="$(sed -n "s/^DNSDOMAIN='\(.*\)'/\1/p" /tmp/net-"${DEVICE}".conf)"
+            #ipconfig-generated file contains sourceable environment variables
+            . /tmp/net-"${DEVICE}".conf
+            rc_search="${DNSDOMAIN}"
             #search might contain multiple entries but domain should only have one.
-            rc_domain="$(sed -n "s/^DNSDOMAIN='\([^ ]*\).*/\1/p" /tmp/net-"${DEVICE}".conf)"
-            rc_server0="$(sed -n "s/^IPV4DNS0='\(.*\)'/\1/p" /tmp/net-"${DEVICE}".conf)"
-            rc_server1="$(sed -n "s/^IPV4DNS1='\(.*\)'/\1/p" /tmp/net-"${DEVICE}".conf)"
-            rc_server0="nameserver ${rc_server0}"
-            if [ "${rc_server1}" = "0.0.0.0" ]; then
+            rc_domain="$(echo "${DNSDOMAIN}" | sed -n -e 's/^\([^ ]\+\) *.*/\1/p')"
+            rc_server0="nameserver ${IPV4DNS0}"
+            if [ "${IPV4DNS1}" = "0.0.0.0" ]; then
                 rc_server1=""
             else
-                rc_server1="nameserver ${rc_server1}"
+                rc_server1="nameserver ${IPV4DNS1}"
             fi
 
             # Deal with resolvconf