Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use Lat15-Terminus16 instead of lat1-16/lat10-16.

  • Loading branch information...
commit 965b86e04b7ab20220eb0ba35212e67080ada6b0 1 parent 2d90189
@mika mika authored
Showing with 14 additions and 11 deletions.
  1. +3 −7 autoconfig.functions
  2. +7 −0 debian/changelog
  3. +4 −4 language-functions
View
10 autoconfig.functions
@@ -208,16 +208,14 @@ config_language(){
einfo "Activating language settings:"
eindent
- # people can specify $LANGUAGE and $CONSOLEFONT in a config file:
+ # people can specify $LANGUAGE and $CONSOLEFONT in a config file
[ -r /etc/grml/autoconfig ] && . /etc/grml/autoconfig
- grep -q ' lang=.*-utf8' /proc/cmdline && UTF8='yes' || UTF8=''
-
- # check for bootoption which overrides config from /etc/grml/autoconfig:
+ # check for bootoption which overrides config from /etc/grml/autoconfig
BOOT_LANGUAGE="$(getbootparam 'lang' 2>>$DEBUG)"
[ -n "$BOOT_LANGUAGE" ] && LANGUAGE="$BOOT_LANGUAGE"
- # set default to 'en' in live-cd mode if $LANGUAGE is not yet set:
+ # set default to 'en' in live-cd mode iff $LANGUAGE is not set yet
if [ -z "$INSTALLED" ] ; then
[ -n "$LANGUAGE" ] || LANGUAGE='en'
fi
@@ -235,8 +233,6 @@ config_language(){
# set console font
if [ -z "$CONSOLEFONT" ] ; then
if ! checkbootparam 'nodefaultfont' >>$DEBUG 2>&1 ; then
- # [ -n "$UTF8" ] && CONSOLEFONT='LatArCyrHeb-16' || CONSOLEFONT='Lat15-Terminus16'
- # if [ -r /usr/share/consolefonts/Lat15-Terminus16.psf.gz ] ; then
if [ -r /usr/share/consolefonts/Uni3-Terminus16.psf.gz ] ; then
CONSOLEFONT='Uni3-Terminus16'
else
View
7 debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.9.6) unstable; urgency=low
+
+ * Use Lat15-Terminus16 instead of lat1-16/lat10-16 to address
+ broken lang=pt feature. [Closes: issue691]
+
+ -- Michael Prokop <mika@grml.org> Fri, 26 Feb 2010 21:36:39 +0100
+
grml-autoconfig (0.9.5) unstable; urgency=low
* Bootoption hostname: use grml-hostname to adjust configuration
View
8 language-functions
@@ -220,7 +220,7 @@ case "$LANGUAGE" in
LANG="fr_FR.ISO-8859-1"
KEYTABLE="cf"
CHARSET="iso8859-1"
- CONSOLEFONT="lat1-16"
+ CONSOLEFONT="Lat15-Terminus16"
XKEYBOARD="ca_enhanced"
KDEKEYBOARD="ca_enhanced"
KDEKEYBOARDS="us"
@@ -440,7 +440,7 @@ case "$LANGUAGE" in
# Additional KDE Keyboards
KDEKEYBOARDS="de,us,fr"
TZ="Europe/Madrid"
- CONSOLEFONT="lat10-16"
+ CONSOLEFONT="Lat15-Terminus16"
;;
fi-iso)
# Finnish version
@@ -704,7 +704,7 @@ case "$LANGUAGE" in
# Additional KDE Keyboards
KDEKEYBOARDS="de,us,fr"
TZ="Europe/Lisbon"
- CONSOLEFONT="lat10-16"
+ CONSOLEFONT="Lat15-Terminus16"
;;
pt|pt-utf8)
# Portuguese version (UTF8)
@@ -718,7 +718,7 @@ case "$LANGUAGE" in
# Additional KDE Keyboards
KDEKEYBOARDS="de,us,fr"
TZ="Europe/Lisbon"
- CONSOLEFONT="lat10-16"
+ CONSOLEFONT="Lat15-Terminus16"
;;
ru-iso)
# Russian version
Please sign in to comment.
Something went wrong with that request. Please try again.