Adding upstream version 3.0~b3.

[live-boot-grml.git] / scripts / boot / 9990-misc-helpers.sh

diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh
index cc39fcb..4429c33 100755 (executable)
--- a/scripts/boot/9990-misc-helpers.sh
+++ b/scripts/boot/9990-misc-helpers.sh
@@ -911,7 +911,9 @@ probe_for_file_name ()
        then
                echo ${ret}
        else
+               # unmount and remove mountpoint
                umount ${backing} > /dev/null 2>&1 || true
+               rmdir ${backing} > /dev/null 2>&1 || true
        fi
 }
 
@@ -1304,7 +1306,7 @@ get_custom_mounts ()
                        local source="${dir}"
                        if [ -n "${opt_source}" ]
                        then
-                               if echo ${opt_source} | grep -q -e "^/" -e "^\(.*/\)\?\.\.\?\(/.*\)\?$" && [ "${source}" != "." ]
+                               if echo ${opt_source} | grep -q -e "^/" -e "^\(.*/\)\?\.\.\?\(/.*\)\?$" && [ "${opt_source}" != "." ]
                                then
                                        log_warning_msg "Skipping unsafe custom mount with option source=${opt_source}: must be either \".\" (the media root) or a relative path w.r.t. the media root that contains neither comas, nor the special \".\" and \"..\" path components"
                                        continue