Applied patch from Frederic Boiteux <fboiteux@calistel.com> about NFSROOT=auto, ...
authorDaniel Baumann <daniel@debian.org>
Sun, 23 Sep 2007 13:11:42 +0000 (15:11 +0200)
committerDaniel Baumann <daniel@debian.org>
Sun, 23 Sep 2007 13:11:42 +0000 (15:11 +0200)
scripts/live

index 7a0a78e..15d5dc8 100755 (executable)
@@ -585,17 +585,17 @@ do_netmount ()
 
        ipconfig ${DEVICE} | tee /netboot.config
 
-       if [ "${NFSROOT}" = "auto" ]
-       then
-               NFSROOT=${ROOTSERVER}:${ROOTPATH}
-       fi
-
        # source relevant ipconfig output
        OLDHOSTNAME=$HOSTNAME
        . /tmp/net-${DEVICE}.conf
        [ -z $HOSTNAME ] && HOSTNAME=$OLDHOSTNAME
        export HOSTNAME
 
+       if [ "${NFSROOT}" = "auto" ]
+       then
+               NFSROOT=${ROOTSERVER}:${ROOTPATH}
+       fi
+
        if [ -n "${FETCH}" ] && do_httpmount
        then
                rc=0