diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-01 14:30:50 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:09 +0100 |
| commit | b7d8cc3bdbfb83bf203baab832cde1f846c8ee9d (patch) | |
| tree | 0409fca269c6a658c200b53c4000b51c4df84520 | |
| parent | 6b23d230e10c2ba5d06828748123f3bff8ba5685 (diff) | |
| download | live-boot-b7d8cc3bdbfb83bf203baab832cde1f846c8ee9d.tar.gz live-boot-b7d8cc3bdbfb83bf203baab832cde1f846c8ee9d.zip | |
Merging casper 1.235.
| -rw-r--r-- | docs/ChangeLog.casper | 6 | ||||
| -rwxr-xr-x | scripts/live-bottom/24preseed | 3 |
2 files changed, 8 insertions, 1 deletions
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@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 |