projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
7dd6394
..
1f5c513
100755
(executable)
--- a/
scripts/live-bottom/24preseed
+++ b/
scripts/live-bottom/24preseed
@@
-26,6
+26,7
@@
then
fi
. /scripts/live-functions
fi
. /scripts/live-functions
+load_confmodule
log_begin_msg "Loading preseed file"
log_begin_msg "Loading preseed file"
@@
-33,14
+34,14
@@
log_begin_msg "Loading preseed file"
if [ -e /preseed.cfg ]
then
if [ -e /preseed.cfg ]
then
-
chroot /root debconf-set-selections <
/preseed.cfg
+
live-set-selections
/preseed.cfg
fi
if [ -n "${LOCATIONS}" ]
then
for item in ${LOCATIONS}
do
fi
if [ -n "${LOCATIONS}" ]
then
for item in ${LOCATIONS}
do
-
chroot /root debconf-set-selections < "/root${ITEM}
"
+
live-set-selections "/root$item
"
done
fi
done
fi
@@
-55,14
+56,20
@@
then
done
fi
done
fi
-reply="$(echo "GET preseed/early_command" | chroot /root debconf-communicate -fnoninteractive live-initramfs)"
-
-if [ "${reply#0 }" != "${reply}" ]
+if db_get preseed/early_command && [ "$RET" ]
then
then
- reply="${reply#0 }"
- sh -c "${reply}"
+ 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
fi
+stop_network
+
# Clear out debconf database backup files to save memory.
rm -f /root/var/cache/debconf/*.dat-old
# Clear out debconf database backup files to save memory.
rm -f /root/var/cache/debconf/*.dat-old