Fix to allow for multiple rof when exposed roots is disabled.
authorIan Reinhart Geiser <geiseri@yahoo.com>
Mon, 30 Apr 2012 17:44:22 +0000 (17:44 +0000)
committerDaniel Baumann <daniel@debian.org>
Mon, 4 Jun 2012 15:39:49 +0000 (17:39 +0200)
scripts/live

index 70ea06e..9d699b7 100755 (executable)
@@ -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"