Merge branch 'lintian-fixes' into 'master'

[live-boot-grml.git] / components / 9990-overlay.sh

diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh
index 37e8499..eb57d4d 100755 (executable)
--- a/components/9990-overlay.sh
+++ b/components/9990-overlay.sh
@@ -195,12 +195,15 @@ setup_unionfs ()
                        do
                                media="$(echo ${media} | tr ":" " ")"
 
-                               case ${media} in
-                                       ${custom_overlay_label}=*)
-                                               device="${media#*=}"
-                                               overlay_devices="${overlay_devices} ${device}"
-                                               ;;
-                                esac
+                               for overlay_label in ${custom_overlay_label}
+                               do
+                                       case ${media} in
+                                               ${overlay_label}=*)
+                                                       device="${media#*=}"
+                                                       overlay_devices="${overlay_devices} ${device}"
+                                                       ;;
+                                       esac
+                               done
                        done
                fi
        elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENCE}" ]
@@ -239,7 +242,7 @@ setup_unionfs ()
 
        if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
        then
-               mount -t tmpfs -o rw,noatime,mode=755,size=${OVERLAY_SIZE:-50%} tmpfs "/live/overlay"
+               mount -t tmpfs -o rw,noatime,mode=755,size=${OVERLAY_SIZE:-50%} tmpfs "/run/live/overlay"
                root_backing="/run/live/persistence/$(basename ${cowdevice})-root"
                mkdir -p ${root_backing}
        else