From 6b23d230e10c2ba5d06828748123f3bff8ba5685 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sat, 1 May 2010 14:30:04 +0200
Subject: Merging casper 1.234.

---
 scripts/live-bottom/24preseed | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'scripts')

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"
-- 
cgit v1.2.3