1 From: Evgeni Golov <evgeni@debian.org>
2 Subject: restore support for old persistence media
4 Index: live-boot-grml/components/9990-aaa-fixme.sh
5 ===================================================================
6 --- live-boot-grml.orig/components/9990-aaa-fixme.sh 2014-03-08 13:43:19.172121783 +0100
7 +++ live-boot-grml/components/9990-aaa-fixme.sh 2014-03-08 13:43:19.164122722 +0100
12 +old_root_overlay_label="live-rw"
13 +old_home_overlay_label="home-rw"
14 custom_overlay_label="persistence"
15 +old_custom_overlay_label="custom-ov"
16 persistence_list="persistence.conf"
17 Index: live-boot-grml/components/9990-misc-helpers.sh
18 ===================================================================
19 --- live-boot-grml.orig/components/9990-misc-helpers.sh 2014-03-08 13:43:19.172121783 +0100
20 +++ live-boot-grml/components/9990-misc-helpers.sh 2014-03-08 13:43:19.168122252 +0100
21 @@ -1632,6 +1632,32 @@
25 +fix_backwards_compatibility ()
27 + local device dir opt backing include_list
32 + if [ -n "${PERSISTENCE_READONLY}" ]
37 + backing="$(mount_persistence_media ${device})"
38 + if [ -z "${backing}" ]
43 + include_list="${backing}/${persistence_list}"
44 + if [ ! -r "${include_list}" ] && [ ! -r "${backing}/${old_persistence_list}" ]
46 + echo "# persistence backwards compatibility:
47 +${dir} ${opt},source=." > "${include_list}"
54 Index: live-boot-grml/components/9990-overlay.sh
55 ===================================================================
56 --- live-boot-grml.orig/components/9990-overlay.sh 2014-03-08 13:43:19.172121783 +0100
57 +++ live-boot-grml/components/9990-overlay.sh 2014-03-08 13:43:19.168122252 +0100
60 if is_in_comma_sep_list overlay ${PERSISTENCE_METHOD}
62 - overlays="${custom_overlay_label}"
63 + overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label} ${old_custom_overlay_label}"
68 media="$(echo ${media} | tr ":" " ")"
71 + ${old_root_overlay_label}=*)
72 + device="${media#*=}"
73 + fix_backwards_compatibility ${device} / union
74 + overlay_devices="${overlay_devices} ${device}"
77 + ${old_home_overlay_label}=*)
78 + device="${media#*=}"
79 + fix_backwards_compatibility ${device} /home bind
80 + overlay_devices="${overlay_devices} ${device}"
83 ${custom_overlay_label}=*)
85 overlay_devices="${overlay_devices} ${device}"
88 + ${old_custom_overlay_label}=*)
89 + device="${media#*=}"
90 + overlay_devices="${overlay_devices} ${device}"