Forward Firewall: changed order of LOG and DROP rules for INPUT Chain

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

diff --git a/src/initscripts/init.d/console b/src/initscripts/init.d/console
index cb61a405ff03963723ad7598976ccd4b61a6e7f6..d69ddd3c0ae0b52a4d8e13fbd04a141847c1db02 100644 (file)
--- a/src/initscripts/init.d/console
+++ b/src/initscripts/init.d/console
@@ -17,17 +17,25 @@
 . ${rc_functions}
 eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
 
-if [ "$LANGUAGE" == "de" ]; then
-       #KEYMAP="de-latin1"
-       KEYMAP_CORRECTIONS="euro2"
-       LEGACY_CHARSET="iso-8859-15"
-       #FONT="LatArCyrHeb-16 -m 8859-15"
-       FONT="lat0-16 -m 8859-15"
-else
-       # English
-       FONT="lat0-16"
-       KEYMAP_CORRECTIONS="euro2"
-fi
+# English is default
+FONT="lat0-16"
+KEYMAP_CORRECTIONS="euro2"
+
+case "${LANGUAGE}" in
+       # German
+       de)
+               LEGACY_CHARSET="iso-8859-15"
+               FONT="lat0-16 -m 8859-15"
+               ;;
+       # Polish
+       pl)
+               FONT="lat2-16"
+               ;;
+       # Russish/Turkish
+       ru|tr)
+               FONT="LatArCyrHeb-16"
+               ;;
+esac
 
 UNICODE="1"
 BROKEN_COMPOSE="0"
@@ -71,7 +79,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