projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removing locales bottom script, now handled by live-config.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
19keyboard
diff --git
a/scripts/live-bottom/19keyboard
b/scripts/live-bottom/19keyboard
index
52a6a58
..
5a262fa
100755
(executable)
--- a/
scripts/live-bottom/19keyboard
+++ b/
scripts/live-bottom/19keyboard
@@
-18,7
+18,7
@@
case "${1}" in
;;
esac
;;
esac
-# live-
initramfs
header
+# live-
boot
header
if [ -n "${NOCONSOLEKEYBOARD}" ]
then
if [ -n "${NOCONSOLEKEYBOARD}" ]
then
@@
-29,7
+29,7
@@
fi
log_begin_msg "Setting up console keyboard"
log_begin_msg "Setting up console keyboard"
-# live-
initramfs
script
+# live-
boot
script
kbd=
cslayout=
kbd=
cslayout=
@@
-107,6
+107,10
@@
then
if [ -f /root/etc/init.d/usplash ]
then
sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash
if [ -f /root/etc/init.d/usplash ]
then
sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash
+ elif [ -f /root/etc/init/usplash.conf ]
+ then
+ sed -i '/^post-stop script/a\
+ setupcon' /root/etc/init/usplash.conf
fi
fi
elif [ -e /root/usr/sbin/install-keymap ]
fi
fi
elif [ -e /root/usr/sbin/install-keymap ]