[SCM] debian-live/live-initramfs branch, master, updated. 1.99.2-1-12-ged24be5

[Daniel Baumann]

The branch, master has been updated
       via  ed24be52d8ac054cf539f5228d75ce4811e599ae (commit)
       via  bf80b10f12cb99dad28116b2430c1f7bd6faefa1 (commit)
      from  860b867fd2c52ac434a06330566140e2761b7703 (commit)


- Shortlog ------------------------------------------------------------
ed24be5 Merge branch 'master' of ssh://git.debian.org/git/users/daniel/live-initramfs
bf80b10 scripts/live

Summary of changes:
-----------------------------------------------------------------------
Details of changes:

commit ed24be52d8ac054cf539f5228d75ce4811e599ae
Merge: bf80b10f12cb99dad28116b2430c1f7bd6faefa1 860b867fd2c52ac434a06330566140e2761b7703
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 12 13:42:16 2007 +0200

    Merge branch 'master' of ssh://git.debian.org/git/users/daniel/live-initramfs


commit bf80b10f12cb99dad28116b2430c1f7bd6faefa1
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.
        http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-September/002173.html

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