Merging casper 1.236.

[live-boot-grml.git] / scripts / live-bottom / 24preseed

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index 60b9be6..1f5c513 100755 (executable)
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -58,16 +58,18 @@ fi
 
 if db_get preseed/early_command && [ "$RET" ]
 then
-       echo 'APT::Keep-Fds { "3"; "4"; };' > /root/etc/apt/apt.conf.d/00-early-debconf
-       DEBIAN_FRONTEND=passthrough \
-       DEBCONF_READFD=3 \
-       DEBCONF_WRITEFD=4 \
-       DEBCONF_DB_REPLACE=configdb \
-       DEBCONF_DB_OVERRIDE='Pipe{infd:none outfd:none}' \
-       sh -c "$RET"
-       rm -f /root/etc/apt/apt.conf.d/00-early-debconf
+       EARLY="$RET"
+       if db_get preseed/allow-network && [ "$RET" = true ]; then
+               start_network
+       fi
+
+       DEBIAN_HAS_FRONTEND= DEBCONF_REDIR= \
+       DEBIAN_FRONTEND=noninteractive \
+       sh -c "$EARLY"
 fi
 
+stop_network
+
 # Clear out debconf database backup files to save memory.
 rm -f /root/var/cache/debconf/*.dat-old