[SCM] live-boot branch, debian-next, updated. debian/3.0_a26-1-32-g83ef11e

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 83ef11e58d1132a609285ba84f0a2fb8c9d7fb4f
Author: Ian Reinhart Geiser <geiseri at yahoo.com>
Date:   Mon Apr 30 17:44:22 2012 +0000

    Fix to allow for multiple rof when exposed roots is disabled.

diff --git a/scripts/live b/scripts/live
index 70ea06e..9d699b7 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1108,15 +1108,15 @@ setup_unionfs ()
 
 	rofscount=$(echo ${rofslist} |wc -w)
 
-	# XXX: we now ensure that there can only be one read-only filesystem. Should this be inside the EXPOSED_ROOT if?
-	if [ ${rofscount} -ne 1 ]
-	then
-		panic "only one RO file system supported with exposedroot: ${rofslist}"
-	fi
 	rofs=${rofslist%% }
 
 	if [ -n "${EXPOSED_ROOT}" ]
 	then
+		if [ ${rofscount} -ne 1 ]
+		then
+			panic "only one RO file system supported with exposedroot: ${rofslist}"
+		fi
+
 		mount --bind ${rofs} ${rootmnt} || \
 			panic "bind mount of ${rofs} failed"
 

-- 
live-boot