[Debian-live-changes] r2555 - dists/trunk/live-initramfs/scripts

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-20 16:17:27 +0000 (Fri, 20 Jul 2007)
New Revision: 2555

Modified:
   dists/trunk/live-initramfs/scripts/live
Log:


Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-07-20 06:27:35 UTC (rev 2554)
+++ dists/trunk/live-initramfs/scripts/live	2007-07-20 16:17:27 UTC (rev 2555)
@@ -145,7 +145,7 @@
 				export MODULE
 				;;
 
-			netboot*)
+			netboot=*)
 				NETBOOT=${x#netboot=}
 				export NETBOOT
 				;;
@@ -406,7 +406,7 @@
     . /tmp/net-${DEVICE}.conf
     export HOSTNAME
 
-    if [ "${NFSROOT#*:}" = "$NFSROOT" ]; then
+    if [ "${NFSROOT#*:}" = "$NFSROOT" ] && [ "$NETBOOT" != "cifs" ]; then
 	NFSROOT=${ROOTSERVER}:${NFSROOT}
     fi