[SCM] live-initramfs branch, debian, updated. debian/1.236.1-1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 9818932dff9f5334fb6b709f1b5168a43e6e6843
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat May 1 14:30:04 2010 +0200

    Merging casper 1.234.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 3b28500..41cb0e6 100644
--- 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 at 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
--- 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"

-- 
live-initramfs