From: Ian Reinhart Geiser <geiseri@yahoo.com>
Date: Mon, 30 Apr 2012 17:44:22 +0000 (+0000)
Subject: Fix to allow for multiple rof when exposed roots is disabled.
X-Git-Tag: debian/3.0_a28-1~5
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=5f89a19cca390e1c4c3e8cba84aaa1f972d0bd8a;hp=5e7955190b877abd2993deca7d87099eeebbe1ee;p=live-boot-grml.git

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"