diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-08 10:08:45 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-08 10:08:45 +0200 |
| commit | f77a615dee76f1c6d560b69ec8c1a245bd46f39c (patch) | |
| tree | 8db0ff94871600fd03606f3cd41bd49a9b2d2bf8 /recipes/busybox/busybox-1.14.3/udhcpc-fix-nfsroot.patch | |
| parent | 076d31f2981d51b093d86b0751121fe1e10669b1 (diff) | |
| parent | a702c1ad0559dd6712857e2e9a8ee82513814569 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/busybox/busybox-1.14.3/udhcpc-fix-nfsroot.patch')
| -rw-r--r-- | recipes/busybox/busybox-1.14.3/udhcpc-fix-nfsroot.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/recipes/busybox/busybox-1.14.3/udhcpc-fix-nfsroot.patch b/recipes/busybox/busybox-1.14.3/udhcpc-fix-nfsroot.patch new file mode 100644 index 0000000000..39716ec14b --- /dev/null +++ b/recipes/busybox/busybox-1.14.3/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 + |