busybox-1.11.3: udhcpd script: Do not deconfig network interface iff rootfs on nfs.
authorLeon Woestenberg <leon@witty.(none)>
Tue, 6 Jan 2009 13:39:22 +0000 (14:39 +0100)
committerLeon Woestenberg <leon@witty.(none)>
Tue, 6 Jan 2009 13:49:10 +0000 (14:49 +0100)
packages/busybox/busybox-1.11.3/udhcpscript.patch

index fc21d44..cad56d2 100644 (file)
@@ -3,9 +3,28 @@
 # Patch managed by http://www.holgerschurig.de/patcher.html
 #
 
---- busybox-1.00-rc3/examples/udhcp/simple.script~udhcpscript
-+++ busybox-1.00-rc3/examples/udhcp/simple.script
-@@ -17,8 +17,7 @@
+Index: busybox-1.11.3/examples/udhcp/simple.script
+===================================================================
+--- busybox-1.11.3.orig/examples/udhcp/simple.script   2008-06-25 14:51:33.000000000 +0200
++++ busybox-1.11.3/examples/udhcp/simple.script        2009-01-06 14:34:40.000000000 +0100
+@@ -8,17 +8,23 @@
+ [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
+ [ -n "$subnet" ] && NETMASK="netmask $subnet"
++# return 0 if root is mounted on a network filesystem
++root_is_nfs() {
++      grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts
++}
++
+ case "$1" in
+       deconfig)
+-              /sbin/ifconfig $interface 0.0.0.0
++              if [ ! root_is_nfs ]; then
++                      /sbin/ifconfig $interface 0.0.0.0
++              fi
+               ;;
+       renew|bound)
                /sbin/ifconfig $interface $ip $BROADCAST $NETMASK
  
                if [ -n "$router" ] ; then