Fix for slugbug 197. This no longer runs udhcp to get the network address

if /etc/default/sysconf has bootproto=static  This affects network boot
(nfs) only - previously a DHCP address would be used in preference to the
specified static one.
All NFS root users please test this - the number of failure cases are large
and a failure may leave the system unbootable.

diff --git a/packages/openslug-init/openslug-init-0.10/functions b/packages/openslug-init/openslug-init-0.10/functions
index ac8e195abd7666e415552a572118c55838f6c465..61b5eb2776be8957bdfe65bfdfbf3d791373dd7e 100755 (executable)
--- a/packages/openslug-init/openslug-init-0.10/functions
+++ b/packages/openslug-init/openslug-init-0.10/functions
@@ -209,10 +209,13 @@ ifup(){
        # is not left running so this will only work for
        # the lease length time!
        ifconfig "$iface" up
-       test -n "$hostname" && HOSTNAME="-H $hostname"
-       # The script writes the required shell variable assignments
-       # to file descriptor 9
-       eval $(udhcpc -i "$iface" -n -q -r "$ip" $HOSTNAME -s /boot/udhcpc.script 9>&1 >/dev/null)
+       if test "$(config boot)" != static
+       then
+               test -n "$hostname" && HOSTNAME="-H $hostname"
+               # The script writes the required shell variable assignments
+               # to file descriptor 9
+               eval $(udhcpc -i "$iface" -n -q -r "$ip" $HOSTNAME -s /boot/udhcpc.script 9>&1 >/dev/null)
+       fi
 
        test -n "$broadcast" && BROADCAST="broadcast $broadcast"
        test -n "$subnet" && NETMASK="netmask $subnet"

diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index 59b8c0fd5dd18431c46f4d6002d281cb1225d6ef..60726d8dc2b159b685f8c78cfd13af111d4acb32 100644 (file)
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/openslug-init/openslug-init_0.10.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r38"
+PR = "r39"
 
 SRC_URI = "file://linuxrc \
           file://boot/flash \