From 2045fef752eae3da560d21e557f08d87638f25ab Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 17 Dec 2012 21:05:32 +0100 Subject: [PATCH] drop 43_do_not_fix_mountpoints_with_live-persistence.patch, applied upstream --- ...43_do_not_fix_mountpoints_with_live-persistence.patch | 16 ---------------- debian/patches/series | 1 - 2 files changed, 17 deletions(-) delete mode 100644 debian/patches/43_do_not_fix_mountpoints_with_live-persistence.patch diff --git a/debian/patches/43_do_not_fix_mountpoints_with_live-persistence.patch b/debian/patches/43_do_not_fix_mountpoints_with_live-persistence.patch deleted file mode 100644 index cb02453..0000000 --- a/debian/patches/43_do_not_fix_mountpoints_with_live-persistence.patch +++ /dev/null @@ -1,16 +0,0 @@ -From 135a17956c50102b978d34d0779c354bb08e9cf9 Mon Sep 17 00:00:00 2001 -From: Evgeni Golov -Date: Mon, 17 Dec 2012 16:52:25 +0100 -Subject: [PATCH] do not fix mountpoints with live-persistence.conf as home-rw/live-rw - ---- a/scripts/boot/9990-misc-helpers.sh -+++ b/scripts/boot/9990-misc-helpers.sh -@@ -1610,7 +1610,7 @@ - fi - - include_list="${backing}/${persistence_list}" -- if [ ! -r "${include_list}" ] -+ if [ ! -r "${include_list}" ] && [ ! -r "${backing}/${old_persistence_list}" ] - then - echo "# persistence backwards compatibility: - ${dir} ${opt},source=." > "${include_list}" diff --git a/debian/patches/series b/debian/patches/series index c7045b7..f471306 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,4 +19,3 @@ 40_support_multiple_hooks.patch 41_drop_nameserver_from_ip_option.patch 42_restore_support_for_custom-ov_persistence.patch -43_do_not_fix_mountpoints_with_live-persistence.patch -- 2.1.4