Merging casper 1.235.

grml · May 11, 2010 · b918b0c · b918b0c
1 parent 9818932
commit b918b0c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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@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
@@ -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