Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Checkgrmlsmall posix #1

Closed
wants to merge 2 commits into from

2 participants

@bionix

To fix issue 7 with german 'UMLAUTE' characters in GRML_SMALL [1]

[1] grml/grml-live#7

bionix added some commits
@bionix bionix Fix a typo error 065d0ac
@bionix bionix Remove standard language settings for grml_small (type: POSIX)
Change default language function to exporting the language from
quickconfig or bootoption or set language to 'en'.
Drop the checkgrmlsmall check in the language config functions.
caa6d24
@mika
Owner

I applied + pushed the POSIX fix, the "typo" actually isn't a typo (iff == "If and only if") so I skipped that one. :)

@mika mika closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 17, 2012
  1. @bionix

    Fix a typo error

    bionix authored
  2. @bionix

    Remove standard language settings for grml_small (type: POSIX)

    bionix authored
    Change default language function to exporting the language from
    quickconfig or bootoption or set language to 'en'.
    Drop the checkgrmlsmall check in the language config functions.
This page is out of date. Refresh to see the latest.
Showing with 5 additions and 9 deletions.
  1. +5 −9 autoconfig.functions
View
14 autoconfig.functions
@@ -218,7 +218,7 @@ config_language(){
BOOT_LANGUAGE="$(getbootparam 'lang' 2>>$DEBUG)"
[ -n "$BOOT_LANGUAGE" ] && LANGUAGE="$BOOT_LANGUAGE"
- # set default to 'en' in live-cd mode iff $LANGUAGE is not set yet
+ # set default to 'en' in live-cd mode if $LANGUAGE is not set yet
if [ -z "$INSTALLED" ] ; then
[ -n "$LANGUAGE" ] || LANGUAGE='en'
fi
@@ -226,10 +226,10 @@ config_language(){
if [ -x /usr/sbin/grml-setlang ] ; then
# if bootoption lang is used update /etc/default/locale accordingly
if [ -n "$BOOT_LANGUAGE" ] ; then
- checkgrmlsmall && /usr/sbin/grml-setlang "POSIX" || /usr/sbin/grml-setlang "$LANGUAGE"
+ /usr/sbin/grml-setlang "$LANGUAGE"
# otherwise default to lang=en
else
- checkgrmlsmall && /usr/sbin/grml-setlang "POSIX" || /usr/sbin/grml-setlang "en"
+ /usr/sbin/grml-setlang "en"
fi
fi
@@ -248,12 +248,8 @@ config_language(){
fi
# export it now, so error messages get translated, too
- if checkgrmlsmall ; then
- export LANG='C' # grml-small does not provide any further locales
- else
- [ -r /etc/default/locale ] && . /etc/default/locale
- export LANG LANGUAGE
- fi
+ [ -r /etc/default/locale ] && . /etc/default/locale
+ export LANG LANGUAGE
# configure keyboard layout, read in already set values first:
[ -r /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard
Something went wrong with that request. Please try again.