aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-09-28 12:54:48 +0000
committerRoy Marples <roy@marples.name>2007-09-28 12:54:48 +0000
commitbefddaf2418cf4a732a46aecfb79cb9cf64b3a40 (patch)
treecd86205c8c5b7796107113d2cad3090a0adb6004
parentb894cdb7383a35d63f16c59bc31c5c619e64db0d (diff)
keymaps now sets unicode keyboard on all defined ttys, #192442
thanks to Pacho Ramos.
-rw-r--r--ChangeLog2
-rwxr-xr-xinit.d.Linux/keymaps18
2 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 47b08822..bfce9430 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
28 Sep 2007; Roy Marples <uberlord@gentoo.org>:
+ keymaps now sets unicode keyboard on all defined ttys, #192442
+ thanks to Pacho Ramos.
net.sh now checks to see if root is net mounted if no predown function
exists, #194074.
enums are now fixed to specific values and are in UPPER CASE.
diff --git a/init.d.Linux/keymaps b/init.d.Linux/keymaps
index 17485124..4b1217cd 100755
--- a/init.d.Linux/keymaps
+++ b/init.d.Linux/keymaps
@@ -30,6 +30,10 @@ start() {
esac
local WINDOWKEYS_KEYMAP= LOADKEYS_UNI=
+ local ttydev= n=
+ [ -d /dev/vc ] \
+ && ttydev=/dev/vc/ \
+ || ttydev=/dev/tty
checkconfig || return 1
@@ -39,8 +43,12 @@ start() {
fi
# Turn on unicode if user wants it
- if [ "${UNICODE}" = "yes" ] ; then
- kbd_mode -u
+ if [ "${UNICODE}" = "yes" ]; then
+ n=1
+ while [ ${n} -le "${RC_TTY_NUMBER}" ]; do
+ kbd_mode -u -C "${ttydev}${n}"
+ n=$((${n} + 1))
+ done
LOADKEYS_UNI="--unicode"
fi
@@ -74,11 +82,9 @@ start() {
termencoding="%@"
termmsg="ASCII"
fi
- local n=1 ttydev=
- [ -d /dev/vc ] \
- && ttydev=/dev/vc/ \
- || ttydev=/dev/tty
+
ebegin "Setting terminal encoding to" ${termmsg}
+ n=1
while [ ${n} -le "${RC_TTY_NUMBER}" ] ; do
printf "\033%s" "${termencoding}" >"${ttydev}${n}"
n=$((${n} + 1))