X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=debian%2Fpatches%2F37_fix_legacy_persistence_handling.patch;fp=debian%2Fpatches%2F37_fix_legacy_persistence_handling.patch;h=3ba7e78950c3dffb02f9e478c26be6647162bc1f;hb=95fb70f1ac45cccc8db0ee62781954f78b0b064f;hp=0000000000000000000000000000000000000000;hpb=5c38cc138fcb792c1a25d0c050725c74cee7d153;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
new file mode 100644
index 0000000..3ba7e78
--- /dev/null
+++ b/debian/patches/37_fix_legacy_persistence_handling.patch
@@ -0,0 +1,33 @@
+commit 7eaab98d69d8bdbc46cceaeac64007b214593174
+Author: lukas227 <lukas-gh@schwaighofer.name>
+Date:   Mon Aug 13 22:35:27 2012 +0200
+
+    fixed legacy persistence handling
+    
+    * 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
+@@ -778,6 +778,7 @@ mount_persistence_media ()
+ 			return 1
+ 		fi
+ 	fi
++	echo ${backing}
+ 	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