projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing find_snap to take its second argument into account.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
24preseed
diff --git
a/scripts/live-bottom/24preseed
b/scripts/live-bottom/24preseed
index
1f5c513
..
85c6494
100755
(executable)
--- a/
scripts/live-bottom/24preseed
+++ b/
scripts/live-bottom/24preseed
@@
-18,7
+18,7
@@
case "${1}" in
;;
esac
;;
esac
-# live-
initramfs
header
+# live-
boot
header
if [ -n "${NOPRESEED}" ]
then
if [ -n "${NOPRESEED}" ]
then
@@
-26,22
+26,21
@@
then
fi
. /scripts/live-functions
fi
. /scripts/live-functions
-load_confmodule
log_begin_msg "Loading preseed file"
log_begin_msg "Loading preseed file"
-# live-
initramfs
script
+# live-
boot
script
if [ -e /preseed.cfg ]
then
if [ -e /preseed.cfg ]
then
-
live-set-selections
/preseed.cfg
+
chroot /root debconf-set-selections <
/preseed.cfg
fi
if [ -n "${LOCATIONS}" ]
then
for item in ${LOCATIONS}
do
fi
if [ -n "${LOCATIONS}" ]
then
for item in ${LOCATIONS}
do
-
live-set-selections "/root$item
"
+
chroot /root debconf-set-selections < "/root${item}
"
done
fi
done
fi
@@
-56,20
+55,14
@@
then
done
fi
done
fi
-if db_get preseed/early_command && [ "$RET" ]
+reply="$(echo "GET preseed/early_command" | chroot /root debconf-communicate -fnoninteractive live-boot)"
+
+if [ "${reply#0 }" != "${reply}" ]
then
then
- 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"
+ reply="${reply#0 }"
+ sh -c "${reply}"
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