[SCM] live-boot branch, debian-next, updated. debian/3.0_a25-1-70-ga39a167

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit aa2f9a8dff5be9a2a41cc7af053821d5afab0478
Author: Tails developers <amnesia at boum.org>
Date:   Tue Feb 14 16:35:52 2012 +0100

    Refactor some global variables from live into live-helpers.

diff --git a/scripts/live b/scripts/live
index f59ae71..5e080f9 100755
--- a/scripts/live
+++ b/scripts/live
@@ -11,12 +11,6 @@ mountpoint="/live/image"
 alt_mountpoint="/media"
 LIVE_MEDIA_PATH="live"
 
-root_overlay_label="full-ov"
-custom_overlay_label="custom-ov"
-root_snapshot_label="live-sn"
-home_snapshot_label="home-sn"
-persistence_list="live.persist"
-
 USERNAME="user"
 USERFULLNAME="Live user"
 HOSTNAME="host"
diff --git a/scripts/live-helpers b/scripts/live-helpers
index d4a5316..9282df6 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -15,6 +15,12 @@ else
 	udevinfo='udevinfo'
 fi
 
+root_overlay_label="full-ov"
+custom_overlay_label="custom-ov"
+root_snapshot_label="live-sn"
+home_snapshot_label="home-sn"
+persistence_list="live.persist"
+
 Arguments ()
 {
 	PRESEEDS=""

-- 
live-boot