X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F37_fix_legacy_persistence_handling.patch;fp=debian%2Fpatches%2F37_fix_legacy_persistence_handling.patch;h=0f36164e4d1da0826b77c5d34f2027016892eb6f;hb=ce765d3020af178c02b15250d65e9e7d8fb9454c;hp=3ba7e78950c3dffb02f9e478c26be6647162bc1f;hpb=76af4813596007fc5e4db649f9dd9b498058e2e2;p=live-boot-grml.git

diff --git a/debian/patches/37_fix_legacy_persistence_handling.patch b/debian/patches/37_fix_legacy_persistence_handling.patch
index 3ba7e78..0f36164 100644
--- a/debian/patches/37_fix_legacy_persistence_handling.patch
+++ b/debian/patches/37_fix_legacy_persistence_handling.patch
@@ -7,13 +7,11 @@ Date:   Mon Aug 13 22:35:27 2012 +0200
     * the mount_persistence_media () function must return the mount point of
       the partition to the caller, even if it was already mounted
       (${backing} = ${old_backing})
-    * Fix the appropriate check that erroneously prevented the use of the
-      (unquoted) dot
 
 diff --git a/scripts/live-helpers b/scripts/live-helpers
 index b90637a..7d5c675 100644
---- a/scripts/live-helpers
-+++ b/scripts/live-helpers
+--- a/scripts/boot/9990-misc-helpers.sh
++++ b/scripts/boot/9990-misc-helpers.sh
 @@ -778,6 +778,7 @@ mount_persistence_media ()
  			return 1
  		fi
@@ -22,12 +20,3 @@ index b90637a..7d5c675 100644
  	return 0
  }
  
-@@ -1334,7 +1335,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