[ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/* | tr '\n' ' ')"
modprobe 9p 2>/dev/null || true
if grep -q 9p /proc/filesystems ; then
- local TAG="grml-parameters"
+ TAG="grml-parameters"
if grep -q "$TAG" /sys/bus/virtio/devices/*/mount_tag 2>/dev/null ; then
- local MOUNTDIR="$(mktemp -d)"
+ MOUNTDIR="$(mktemp -d)"
mount -t 9p -o trans=virtio,ro "$TAG" "$MOUNTDIR"
CMDLINE="$CMDLINE $(cat "$MOUNTDIR"/* 2>/dev/null | tr '\n' ' ')"
umount "$MOUNTDIR"
eoutdent
fi
}
+
+# }}}
+
+# {{{ display hostkeys of SSH server
+config_display_ssh_fingerprints() {
+ if ! ls /etc/ssh/ssh_host_\*_key >/dev/null 2>&1 ; then
+ return 0 # no SSH host keys present
+ fi
+
+ einfo "SSH key fingerprints:"
+ for file in /etc/ssh/ssh_host_*_key ; do
+ einfon
+ ssh-keygen -l -f $file
+ done | column -t
+ eend $?
+}
# }}}
# {{{ autostart of x11vnc
fi
}
# }}}
+
# {{{ fix/workaround for unionfs
fix_unionfs(){
if [ -z "$INSTALLED" ]; then
GRMLCFG="$(getbootparam 'autoconfig' 2>>$DEBUG)"
[ -n "$GRMLCFG" ] || GRMLCFG="GRMLCFG"
if checkbootparam 'noautoconfig' || checkbootparam 'forensic' ; then
+ DCSDIR="/live/image" # set default so it works for "scripts" boot option as expected
ewarn "Skipping running automount of device(s) labeled $GRMLCFG as requested." ; eend 0
else
if [ -z "$INSTALLED" ] ; then
sh -c $SCRIPTS
elif [ -d "$SCRIPTS" ]; then
einfo "Bootparameter scripts found. Trying to execute from directory ${SCRIPTS}:"
- run-parts $SCRIPTS
+ run-parts --regex '.*' $SCRIPTS
else
einfo "Bootparameter scripts found. Trying to execute ${SCRIPTS}:"
sh -c $SCRIPTS