From 0d21b871d762dab234d67208f1586fb67ba21b5b Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sat, 13 Jul 2013 01:46:49 +0200 Subject: RootFS: call udhcpc at startup and take into account nfs rootfs Signed-off-by: Abdoulaye Walsimou Gaye --- src/rootfs_skel/etc/inittab | 1 + src/rootfs_skel/usr/share/udhcpc/default.script | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/rootfs_skel/etc/inittab b/src/rootfs_skel/etc/inittab index 8c809af..baf8f6b 100644 --- a/src/rootfs_skel/etc/inittab +++ b/src/rootfs_skel/etc/inittab @@ -20,6 +20,7 @@ null::sysinit:/bin/mount -a null::sysinit:/bin/hostname -F /etc/hostname null::sysinit:/sbin/ifconfig lo 127.0.0.1 up null::sysinit:/sbin/route add -net 127.0.0.0 netmask 255.0.0.0 lo +null::sysinit:/sbin/udhcpc # now run any rc scripts ::sysinit:/etc/init.d/rcS diff --git a/src/rootfs_skel/usr/share/udhcpc/default.script b/src/rootfs_skel/usr/share/udhcpc/default.script index a52a7f8..5df5366 100755 --- a/src/rootfs_skel/usr/share/udhcpc/default.script +++ b/src/rootfs_skel/usr/share/udhcpc/default.script @@ -8,19 +8,28 @@ RESOLV_CONF="/etc/resolv.conf" [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" [ -n "$subnet" ] && NETMASK="netmask $subnet" +nfs_rootfs() +{ + grep -qe '/ nfs .*' /proc/mounts +} + case "$1" in deconfig) - /sbin/ifconfig $interface 0.0.0.0 + if ! nfs_rootfs; then + /sbin/ifconfig $interface 0.0.0.0 + fi ;; renew|bound) /sbin/ifconfig $interface $ip $BROADCAST $NETMASK if [ -n "$router" ] ; then - echo "deleting routers" - while route del default gw 0.0.0.0 dev $interface ; do - : - done + if ! nfs_rootfs; then + echo "deleting routers" + while route del default gw 0.0.0.0 dev $interface ; do + : + done + fi for i in $router ; do route add default gw $i dev $interface -- cgit v1.2.3