[SCM] live-initramfs branch, debian-next, updated. debian/1.215.1-1-21-g5999a3e

Daniel Baumann daniel at debian.org
Tue May 11 16:45:14 UTC 2010


The following commit has been merged in the debian-next branch:
commit b918b0c03337d6ac9f3ff5a9579a2be3b6e65e33
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat May 1 14:30:50 2010 +0200

    Merging casper 1.235.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 41cb0e6..b477e27 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,9 @@
+casper (1.235) lucid; urgency=low
+
+  * Unbreak early command from previous commit.
+
+ -- Mario Limonciello <Mario_Limonciello at Dell.com>  Thu, 15 Apr 2010 02:54:15 -0500
+
 casper (1.234) lucid; urgency=low
 
   * Only bring the network up while running preseed/early_command if
diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index 68f97b9..1f5c513 100755
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -58,13 +58,14 @@ fi
 
 if db_get preseed/early_command && [ "$RET" ]
 then
+	EARLY="$RET"
 	if db_get preseed/allow-network && [ "$RET" = true ]; then
 		start_network
 	fi
 
 	DEBIAN_HAS_FRONTEND= DEBCONF_REDIR= \
 	DEBIAN_FRONTEND=noninteractive \
-	sh -c "$RET"
+	sh -c "$EARLY"
 fi
 
 stop_network

-- 
live-initramfs



More information about the debian-live-changes mailing list