From: Evgeni Golov Date: Mon, 17 Dec 2012 14:54:45 +0000 (+0100) Subject: drop 37_fix_legacy_persistence_handling.patch, applied upstream X-Git-Tag: v3.0_b9-1+grml.1~5 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=bdc44cda22e2e4f9e174b31fc7eecd41670cb9ef drop 37_fix_legacy_persistence_handling.patch, applied upstream --- diff --git a/debian/patches/37_fix_legacy_persistence_handling.patch b/debian/patches/37_fix_legacy_persistence_handling.patch deleted file mode 100644 index 0f36164..0000000 --- a/debian/patches/37_fix_legacy_persistence_handling.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 7eaab98d69d8bdbc46cceaeac64007b214593174 -Author: lukas227 -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}) - -diff --git a/scripts/live-helpers b/scripts/live-helpers -index b90637a..7d5c675 100644 ---- a/scripts/boot/9990-misc-helpers.sh -+++ b/scripts/boot/9990-misc-helpers.sh -@@ -778,6 +778,7 @@ mount_persistence_media () - return 1 - fi - fi -+ echo ${backing} - return 0 - } - diff --git a/debian/patches/series b/debian/patches/series index ed51e7e..e6cd145 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,6 +15,5 @@ 33_retry_phram.patch 34_ignore_unknown_filesystems.patch 36_support_dhcp_bootoption.patch -37_fix_legacy_persistence_handling.patch 39_persistence_with_forensic.patch 40_support_multiple_hooks.patch