summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-05-01 14:30:04 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:09 +0100
commit6b23d230e10c2ba5d06828748123f3bff8ba5685 (patch)
treef18d3d8aaa4ff4f6ae675911cd7b26fa95f39630 /scripts
parente692c692d0dc9249603d0cf9d4f10677a1ae0a9c (diff)
downloadlive-boot-6b23d230e10c2ba5d06828748123f3bff8ba5685.tar.gz
live-boot-6b23d230e10c2ba5d06828748123f3bff8ba5685.zip
Merging casper 1.234.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live-bottom/24preseed5
1 files changed, 4 insertions, 1 deletions
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"