more forwardporting \o/

[live-boot-grml.git] / debian / patches / 42_restore_support_for_custom-ov_persistence.patch

diff --git a/debian/patches/42_restore_support_for_custom-ov_persistence.patch b/debian/patches/42_restore_support_for_custom-ov_persistence.patch
deleted file mode 100644 (file)
index e99d40b..0000000
--- a/debian/patches/42_restore_support_for_custom-ov_persistence.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6ec8937c83b321e4a56f264f9e0f5f0a8dd61c6e Mon Sep 17 00:00:00 2001
-From: Evgeni Golov <evgeni@debian.org>
-Date: Mon, 17 Dec 2012 16:54:33 +0100
-Subject: [PATCH] restore support for persistence media with LABEL=custom-ov
-
----
- scripts/boot/9990-aaa-fixme.sh |    1 +
- scripts/boot/9990-overlay.sh   |    7 ++++++-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
---- a/scripts/boot/9990-aaa-fixme.sh
-+++ b/scripts/boot/9990-aaa-fixme.sh
-@@ -43,6 +43,7 @@
- old_root_overlay_label="live-rw"
- old_home_overlay_label="home-rw"
- custom_overlay_label="persistence"
-+old_custom_overlay_label="custom-ov"
- persistence_list="persistence.conf"
- old_persistence_list="live-persistence.conf"
- 
---- a/scripts/boot/9990-overlay.sh
-+++ b/scripts/boot/9990-overlay.sh
-@@ -210,7 +210,7 @@
- 
-               if is_in_comma_sep_list overlay ${PERSISTENCE_METHOD}
-               then
--                      overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}"
-+                      overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label} ${old_custom_overlay_label}"
-               fi
- 
-               local overlay_devices
-@@ -238,6 +238,11 @@
-                                               device="${media#*=}"
-                                               overlay_devices="${overlay_devices} ${device}"
-                                               ;;
-+
-+                                      ${old_custom_overlay_label}=*)
-+                                              device="${media#*=}"
-+                                              overlay_devices="${overlay_devices} ${device}"
-+                                              ;;
-                                esac
-                       done
-               fi