projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.174.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
20xconfig
diff --git
a/scripts/live-bottom/20xconfig
b/scripts/live-bottom/20xconfig
index
f6a3f8d
..
d06b2d6
100755
(executable)
--- a/
scripts/live-bottom/20xconfig
+++ b/
scripts/live-bottom/20xconfig
@@
-75,8
+75,13
@@
then
setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
fi
setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
fi
+if [ -n "${KLAYOUT}" ]
+then
+ setlayout="set xserver-xorg/config/inputdevice/keyboard/layout ${KLAYOUT}"
+fi
+
chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
-
set xserver-xorg/config/inputdevice/keyboard/layout ${kbd
}
+
${setlayout
}
${setvariant}
${setmodel}
${setoptions}
${setvariant}
${setmodel}
${setoptions}