X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=a010368be28a8ec7d9d40f8a9946bacf328a24e2;hp=14533e73b58b1a4aad945ee46a4c20c6dd000b6f;hb=965b86e04b7ab20220eb0ba35212e67080ada6b0;hpb=2d901890e1d130b05c08a3af126c14fea3a1a6c8 diff --git a/autoconfig.functions b/autoconfig.functions index 14533e7..a010368 100755 --- a/autoconfig.functions +++ b/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