[SCM] live-boot branch, debian-next, updated. debian/3.0_a25-1-31-g38757eb

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 38757eb448bd7e7725085047434df1a4664ddfe2
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Apr 4 10:50:11 2012 +0200

    Adjusting mount calls when using nfs options (Closes: #667435).

diff --git a/scripts/live b/scripts/live
index 494abc7..84924c9 100755
--- a/scripts/live
+++ b/scripts/live
@@ -988,9 +988,9 @@ do_nfsmount ()
 
 	modprobe -q nfs
 
-	if [ -z "${NFSOPTS}" ]
+	if [ -n "${NFSOPTS}" ]
 	then
-		NFSOPTS=""
+		NFSOPTS="-o ${NFSOPTS}"
 	fi
 
 	log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}"
@@ -1017,7 +1017,7 @@ do_cifsmount ()
 		then
 			CIFSOPTS="-ouser=root,password="
 		else
-			CIFSOPTS="${NFSOPTS}"
+			CIFSOPTS="-o ${NFSOPTS}"
 		fi
 
 		log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"

-- 
live-boot