aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/rc.conf2
-rw-r--r--init.d/keymaps.in2
-rw-r--r--init.d/save-termencoding.in2
-rw-r--r--init.d/termencoding.in4
4 files changed, 5 insertions, 5 deletions
diff --git a/etc/rc.conf b/etc/rc.conf
index 7140469d..0dd3b8f7 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -89,7 +89,7 @@
# There variables are shared between many init scripts
# Set unicode to NO to turn off unicode support for keyboards and screens.
-unicode="YES"
+#unicode="YES"
# This is how long fuser should wait for a remote server to respond. The
# default is 60 seconds, but it can be adjusted here.
diff --git a/init.d/keymaps.in b/init.d/keymaps.in
index 48d714a4..fa7f1958 100644
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -42,7 +42,7 @@ start()
fi
local wkeys= kmode="-a" msg="ASCII"
- if yesno $unicode; then
+ if yesno ${unicode:-yes}; then
kmode="-u"
msg="UTF-8"
fi
diff --git a/init.d/save-termencoding.in b/init.d/save-termencoding.in
index 378799e5..bf08de39 100644
--- a/init.d/save-termencoding.in
+++ b/init.d/save-termencoding.in
@@ -25,7 +25,7 @@ start()
# Save the encoding for use immediately at boot
if checkpath -W "$RC_LIBEXECDIR"; then
mkdir -p "$RC_LIBEXECDIR"/console
- if yesno ${unicode:-${UNICODE}}; then
+ if yesno ${unicode:-yes}; then
echo "" > "$RC_LIBEXECDIR"/console/unicode
else
rm -f "$RC_LIBEXECDIR"/console/unicode
diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index bde71e7a..783df525 100644
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -28,7 +28,7 @@ start()
# Set terminal encoding to either ASCII or UNICODE.
# See utf-8(7) for more information.
local termencoding="%@" termmsg="ASCII"
- if yesno ${unicode}; then
+ if yesno ${unicode:-yes}; then
termencoding="%G"
termmsg="UTF-8"
fi
@@ -43,7 +43,7 @@ start()
# Save the encoding for use immediately at boot
if checkpath -W "$RC_LIBEXECDIR"; then
mkdir -p "$RC_LIBEXECDIR"/console
- if yesno ${unicode:-${UNICODE}}; then
+ if yesno ${unicode:-yes}; then
echo "" > "$RC_LIBEXECDIR"/console/unicode
else
rm -f "$RC_LIBEXECDIR"/console/unicode