From: Daniel Baumann Date: Sat, 1 May 2010 12:30:50 +0000 (+0200) Subject: Merging casper 1.235. X-Git-Tag: debian/2.0.15-1~128 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=b7d8cc3bdbfb83bf203baab832cde1f846c8ee9d 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 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