Merging casper 1.235.
authorDaniel Baumann <daniel@debian.org>
Sat, 1 May 2010 12:30:50 +0000 (14:30 +0200)
committerDaniel Baumann <daniel@debian.org>
Wed, 9 Mar 2011 16:48:09 +0000 (17:48 +0100)
docs/ChangeLog.casper
scripts/live-bottom/24preseed

index 41cb0e6..b477e27 100644 (file)
@@ -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
index 68f97b9..1f5c513 100755 (executable)
@@ -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