e99d40bfa8d51ae8b8bb2e99aade6afdfdf6e5d0
[live-boot-grml.git] / debian / patches / 42_restore_support_for_custom-ov_persistence.patch
1 From 6ec8937c83b321e4a56f264f9e0f5f0a8dd61c6e Mon Sep 17 00:00:00 2001
2 From: Evgeni Golov <evgeni@debian.org>
3 Date: Mon, 17 Dec 2012 16:54:33 +0100
4 Subject: [PATCH] restore support for persistence media with LABEL=custom-ov
5
6 ---
7  scripts/boot/9990-aaa-fixme.sh |    1 +
8  scripts/boot/9990-overlay.sh   |    7 ++++++-
9  2 files changed, 7 insertions(+), 1 deletion(-)
10
11 --- a/scripts/boot/9990-aaa-fixme.sh
12 +++ b/scripts/boot/9990-aaa-fixme.sh
13 @@ -43,6 +43,7 @@
14  old_root_overlay_label="live-rw"
15  old_home_overlay_label="home-rw"
16  custom_overlay_label="persistence"
17 +old_custom_overlay_label="custom-ov"
18  persistence_list="persistence.conf"
19  old_persistence_list="live-persistence.conf"
20  
21 --- a/scripts/boot/9990-overlay.sh
22 +++ b/scripts/boot/9990-overlay.sh
23 @@ -210,7 +210,7 @@
24  
25                 if is_in_comma_sep_list overlay ${PERSISTENCE_METHOD}
26                 then
27 -                       overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}"
28 +                       overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label} ${old_custom_overlay_label}"
29                 fi
30  
31                 local overlay_devices
32 @@ -238,6 +238,11 @@
33                                                 device="${media#*=}"
34                                                 overlay_devices="${overlay_devices} ${device}"
35                                                 ;;
36 +
37 +                                       ${old_custom_overlay_label}=*)
38 +                                               device="${media#*=}"
39 +                                               overlay_devices="${overlay_devices} ${device}"
40 +                                               ;;
41                                  esac
42                         done
43                 fi