diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-02-04 11:43:18 -0500 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-02-04 11:43:18 -0500 |
| commit | ec4da6df3ad5b8b03446d0dda9c50a2439ae325a (patch) | |
| tree | aa2eff8ad8ed13b85569cd6031c684dd9bf16109 | |
| parent | 5686c090be185d2b6709bb82e785cbbf49175b37 (diff) | |
busybox: fix nfsroot issues with resetting IP and deleting routes
| -rw-r--r-- | packages/busybox/busybox-1.13.2/udhcpc-fix-nfsroot.patch | 40 | ||||
| -rw-r--r-- | packages/busybox/busybox_1.13.2.bb | 4 |
2 files changed, 42 insertions, 2 deletions
diff --git a/packages/busybox/busybox-1.13.2/udhcpc-fix-nfsroot.patch b/packages/busybox/busybox-1.13.2/udhcpc-fix-nfsroot.patch new file mode 100644 index 0000000000..39716ec14b --- /dev/null +++ b/packages/busybox/busybox-1.13.2/udhcpc-fix-nfsroot.patch @@ -0,0 +1,40 @@ +diff -uNr busybox-1.13.2-orig/examples/udhcp/simple.script busybox-1.13.2/examples/udhcp/simple.script +--- busybox-1.13.2-orig/examples/udhcp/simple.script 2009-02-04 11:08:13.000000000 -0500 ++++ busybox-1.13.2/examples/udhcp/simple.script 2009-02-04 11:24:51.000000000 -0500 +@@ -8,22 +8,31 @@ + [ -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 +- while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do +- : +- done ++ if ! root_is_nfs ; then ++ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do ++ : ++ done ++ fi + + metric=0 + for i in $router ; do +- route add default gw $i dev $interface metric $((metric++)) ++ route add default gw $i dev $interface metric $((metric++)) 2>/dev/null + done + fi + diff --git a/packages/busybox/busybox_1.13.2.bb b/packages/busybox/busybox_1.13.2.bb index c8aac79d6d..56f47b37a2 100644 --- a/packages/busybox/busybox_1.13.2.bb +++ b/packages/busybox/busybox_1.13.2.bb @@ -1,11 +1,12 @@ require busybox.inc -PR = "r9" +PR = "r10" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ \ file://udhcpscript.patch;patch=1 \ + file://udhcpc-fix-nfsroot.patch;patch=1 \ file://B921600.patch;patch=1 \ file://r24785.patch;patch=1;status=merged \ file://find-touchscreen.sh \ @@ -37,4 +38,3 @@ do_install_append() { install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev/ install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/ } - |