Add patch to restore support for persistence media with LABEL=custom-ov
authorMichael Prokop <mika@grml.org>
Mon, 17 Dec 2012 16:46:33 +0000 (17:46 +0100)
committerMichael Prokop <mika@grml.org>
Mon, 17 Dec 2012 16:46:33 +0000 (17:46 +0100)
debian/patches/43_do_not_fix_mountpoints_with_live-persistence.patch [new file with mode: 0644]
debian/patches/series

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
new file mode 100644 (file)
index 0000000..cb02453
--- /dev/null
@@ -0,0 +1,16 @@
+From 135a17956c50102b978d34d0779c354bb08e9cf9 Mon Sep 17 00:00:00 2001
+From: Evgeni Golov <evgeni@debian.org>
+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}"
index f471306..c7045b7 100644 (file)
@@ -19,3 +19,4 @@
 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