Patch by Steven Shiau <steven@nchc.org.tw>. The only changes so far are:

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

diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh
index 316a21d..9282276 100755 (executable)
--- a/components/9990-overlay.sh
+++ b/components/9990-overlay.sh
@@ -8,16 +8,12 @@ setup_unionfs ()
        rootmnt="${2}"
        addimage_directory="${3}"
 
-       case ${UNIONTYPE} in
-               aufs|overlay)
-                       if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$"
-                       then
-                               panic "${UNIONTYPE} not available."
-                       fi
+       modprobe -q -b ${UNIONTYPE}
 
-                       modprobe -q -b ${UNIONTYPE}
-                       ;;
-       esac
+       if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$"
+       then
+               panic "${UNIONTYPE} not available."
+       fi
 
        # run-init can't deal with images in a subdir, but we're going to
        # move all of these away before it runs anyway.  No, we're not,
@@ -303,6 +299,9 @@ setup_unionfs ()
                fi || panic "mount ${UNIONTYPE} on ${unionmountpoint} failed with option ${unionmountopts}"
        done
 
+       # Remove persistence depending on boot parameter
+       Remove_persistence
+
        # Correct the permissions of /:
        chmod 0755 "${rootmnt}"