[SCM] debian-live/live-initramfs branch, master, updated. 1.99.2-1-10-g860b867

[Daniel Baumann]

The branch, master has been updated
       via  860b867fd2c52ac434a06330566140e2761b7703 (commit)
      from  272d95beb68bd9060a18c393b7b5f5c0132bc8bc (commit)


- Shortlog ------------------------------------------------------------
860b867 scripts/live

Summary of changes:
 scripts/live |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 860b867fd2c52ac434a06330566140e2761b7703
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 12 13:36:25 2007 +0200

    scripts/live
    
      [ Frederic Boiteux <fboiteux at calistel.com> ]
      * Correcting live-initramfs with NFSROOT=auto.

diff --git a/scripts/live b/scripts/live
index 7a0a78e..15d5dc8 100755
--- a/scripts/live
+++ b/scripts/live
@@ -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

-- 
debian-live/live-initramfs