X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F9990-misc-helpers.sh;h=4429c33d74387bff823f5ff40f931a7095c45bb5;hb=2d6f480a16a5af6d8a1599716ca8d859b1e69ee4;hp=cc39fcbb230984b267b9d4f1ded11f126c98bc36;hpb=2e70d7be610c9e45787c37352d36241de3c155d7;p=live-boot-grml.git

diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh
index cc39fcb..4429c33 100755
--- 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