Adding casper 1.77+debian-4.

[live-boot-grml.git] / scripts / casper-bottom / 19keyboard

diff --git a/scripts/casper-bottom/19keyboard b/scripts/casper-bottom/19keyboard
index 7acc4e4..fc2baf9 100755 (executable)
--- a/scripts/casper-bottom/19keyboard
+++ b/scripts/casper-bottom/19keyboard
@@ -20,22 +20,27 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-kbd=us
+kbd=
 cslayout=
 csvariant=
 csmodel=
 
 # commandline
-if [ ! -z "${KBD}" ]; then
+if [ -n "${KBD}" ]; then
     kbd="${KBD}"
+else
+    kbd=us
 fi
-if [ ! -z "${CSLAYOUT}" ]; then
+
+really_export kbd
+
+if [ -n "${CSLAYOUT}" ]; then
     cslayout="${CSLAYOUT}"
 fi
-if [ ! -z "${CSVARIANT}" ]; then
+if [ -n "${CSVARIANT}" ]; then
     csvariant="${CSVARIANT}"
 fi
-if [ ! -z "${CSMODEL}" ]; then
+if [ -n "${CSMODEL}" ]; then
     csmodel="${CSMODEL}"
 fi