From a55d10c05ca60746b1888c9a6e5a167bb108b223 Mon Sep 17 00:00:00 2001 From: Philippe Seewer Date: Tue, 16 Jun 2009 11:35:49 +0200 Subject: [PATCH] netroot: Use same method to check for already mounted root as init base/init uses [ -d "$NEWROOT/proc" ] to check if root is mounted or not. Netroot should do the same. In addition this gets rid of another file in /tmp, since /tmp/netroot.done isn't needed anymore. --- modules.d/40network/netroot | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/modules.d/40network/netroot b/modules.d/40network/netroot index 53be6cf6d..31c899b6f 100755 --- a/modules.d/40network/netroot +++ b/modules.d/40network/netroot @@ -23,23 +23,17 @@ getarg rdnetdebug && { exit 1 } -netif=$1 +# There's no sense in doing something if no (net)root info is available +# or root is already there +[ -e /tmp/root.info ] || exit 1 +. /tmp/root.info +[ -d $NEWROOT/proc ] && exit 0 +[ -z "$netroot" ] && exit 1 -# If we've already found a root, or we don't have the info we need, -# then no point in looking further -# -[ -e /tmp/netroot.done ] && exit 0 -[ -f /tmp/root.info ] || exit 1 +netif=$1 -# Pick up our config from the command line; we may already know the -# handler to run -# -. /tmp/root.info [ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts -# Don't continue if netroot isn't needed -[ -z "$netroot" ] && exit 0 - # Now, let the installed network root handlers figure this out # source_all netroot @@ -75,6 +69,5 @@ if $handler $netif $netroot $NEWROOT; then #DNS2=1.2.3.5 #GATEWAY=172.16.101.254 fi - >/tmp/netroot.done fi exit 0 -- 2.47.3