Merging casper 1.234.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 3b28500..41cb0e6 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,10 @@
+casper (1.234) lucid; urgency=low
+
+  * Only bring the network up while running preseed/early_command if
+    preseed/allow-network=true.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 14 Apr 2010 15:56:40 +0100
+
 casper (1.233) lucid; urgency=low
 
   * Bring the network up while running preseed/early_command.

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index fb980bd..68f97b9 100755 (executable)
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -58,7 +58,10 @@ fi
 
 if db_get preseed/early_command && [ "$RET" ]
 then
-       start_network
+       if db_get preseed/allow-network && [ "$RET" = true ]; then
+               start_network
+       fi
+
        DEBIAN_HAS_FRONTEND= DEBCONF_REDIR= \
        DEBIAN_FRONTEND=noninteractive \
        sh -c "$RET"