Merge remote-tracking branch 'mfischer/snort' into next

[ipfire-2.x.git] / src / initscripts / init.d / console

diff --git a/src/initscripts/init.d/console b/src/initscripts/init.d/console
index bc1f4e043cbf314fb6d0ff5dfe525999b21b1e07..7381a69b3cccc3a4d058f72b9d3057d51de83484 100644 (file)
--- a/src/initscripts/init.d/console
+++ b/src/initscripts/init.d/console
@@ -15,14 +15,12 @@
 
 . /etc/sysconfig/rc
 . ${rc_functions}
+eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
 
-# Native English speakers probably don't have /etc/sysconfig/console at all
-if [ -f /etc/sysconfig/console ]
-then
-       . /etc/sysconfig/console
-else
-        exit 0
-fi
+FONT="LatArCyrHeb-16"
+KEYMAP_CORRECTIONS="euro2"
+UNICODE="1"
+BROKEN_COMPOSE="0"
 
 is_true() {
        [ "$1" = "1" ] || [ "$1" = "yes" ] || [ "$1" = "true" ]
@@ -63,7 +61,7 @@ case "${1}" in
                        grep -o '\btty[[:digit:]]*\b'`
                do
                        openvt -f -w -c ${TTY#tty} -- \
-                               /bin/sh -c "${MODE_COMMAND}"
+                               /bin/sh -c "${MODE_COMMAND}" 2>/dev/null
                done
 
                # Set the font (if not already set above) and the keymap