refresh patches against Debian's 3.0~b6-1

[live-boot-grml.git] / debian / patches / 37_fix_legacy_persistence_handling.patch

diff --git a/debian/patches/37_fix_legacy_persistence_handling.patch b/debian/patches/37_fix_legacy_persistence_handling.patch
index 3ba7e78..0f36164 100644 (file)
--- 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