[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH] Fix persistence-label.



Hi,

See commit message in the attached patch for details. Note that the
issue described there is not present in live-boot 4.x, so the patch is
intended for live-boot 3.x.

Cheers!
>From fde4836c35b4403fd5d48f93e16879b5f413cdb1 Mon Sep 17 00:00:00 2001
From: Tails developers <amnesia@boum.org>
Date: Thu, 23 May 2013 13:38:19 +0200
Subject: [PATCH] Fix persistence-label.

Setting old_{root,home}_overlay_label made a bit of sense for
persistence-subtext, which *adds* a suffix to the end of the default
labels (so they'll remain different), but it does not make any sense
for persistence-label, which sets them, and custom_overlay_label, to
the *same* value. Due to the latter persistence-label is currently
broken; if a label is found, the corresponding device/image will be
used three times as a persistent media: (1) as a "standard" overlay,
(2) home-rw and (3) live-rw backwards compatibility overlays. In my
tests, this results in no persistence at all.
---
 scripts/boot/9990-cmdline-old |    2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/boot/9990-cmdline-old b/scripts/boot/9990-cmdline-old
index 85f1b62..b8fc4a6 100755
--- a/scripts/boot/9990-cmdline-old
+++ b/scripts/boot/9990-cmdline-old
@@ -188,8 +188,6 @@ Cmdline_old ()
 				;;
 
 			persistence-label=*)
-				old_root_overlay_label="${_PARAMETER#persistence-label=*}"
-				old_home_overlay_label="${_PARAMETER#persistence-label=*}"
 				custom_overlay_label="${_PARAMETER#persistence-label=*}"
 				;;
 
-- 
1.7.10.4


Reply to: