projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not print misleading debug message if the snapshot was found correctly.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
24preseed
diff --git
a/scripts/live-bottom/24preseed
b/scripts/live-bottom/24preseed
index
2536bd0
..
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
@@
-29,16
+29,19
@@
fi
log_begin_msg "Loading preseed file"
log_begin_msg "Loading preseed file"
-# live-
initramfs
script
+# live-
boot
script
if [ -e /preseed.cfg ]
then
chroot /root debconf-set-selections < /preseed.cfg
fi
if [ -e /preseed.cfg ]
then
chroot /root debconf-set-selections < /preseed.cfg
fi
-if [ -
f "/root/${LOCATION
}" ]
+if [ -
n "${LOCATIONS
}" ]
then
then
- chroot /root debconf-set-selections < "/root/${LOCATION}"
+ for item in ${LOCATIONS}
+ do
+ chroot /root debconf-set-selections < "/root${item}"
+ done
fi
if [ -n "${PRESEEDS}" ]
fi
if [ -n "${PRESEEDS}" ]
@@
-52,7
+55,7
@@
then
done
fi
done
fi
-reply="$(echo "GET preseed/early_command" | chroot /root debconf-communicate -fnoninteractive live-
initramfs
)"
+reply="$(echo "GET preseed/early_command" | chroot /root debconf-communicate -fnoninteractive live-
boot
)"
if [ "${reply#0 }" != "${reply}" ]
then
if [ "${reply#0 }" != "${reply}" ]
then