projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding live-initramfs 1.95.1-1.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
19keyboard
diff --git
a/scripts/live-bottom/19keyboard
b/scripts/live-bottom/19keyboard
index
31cdfaa
..
974b847
100755
(executable)
--- a/
scripts/live-bottom/19keyboard
+++ b/
scripts/live-bottom/19keyboard
@@
-1,24
+1,30
@@
#!/bin/sh
#!/bin/sh
-PREREQ=""
-DESCRIPTION="Setting up console keyboard..."
+#set -e
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
prereqs()
{
prereqs()
{
- echo "$
PREREQ
"
+ echo "$
{PREREQ}
"
}
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Setting up console keyboard..."
+
+# live-initramfs script
kbd=
cslayout=
kbd=
cslayout=
@@
-65,6
+71,8
@@
if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
live-preseed /root console-setup/variantcode '' false
live-preseed /root console-setup/modelcode '' false
fi
live-preseed /root console-setup/variantcode '' false
live-preseed /root console-setup/modelcode '' false
fi
+
+ sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash
else
chroot /root /usr/sbin/install-keymap $kbd
live-preseed /root debian-installer/keymap "$kbd"
else
chroot /root /usr/sbin/install-keymap $kbd
live-preseed /root debian-installer/keymap "$kbd"