From eb9bc263efc57475fc68a3c06c40bf8248a2195c Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Wed, 11 Mar 2009 18:05:21 +0000 Subject: Setting the localization properly ... git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2713 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initramfs/distro-specs/suse/functions-default | 5 ++-- initramfs/stage3-stuff/bin/servconfig | 4 ++- initramfs/stage3-stuff/etc/functions | 40 +++++++++++++-------------- initramfs/stage3-stuff/etc/messages | 2 ++ initramfs/stage3-stuff/etc/messages.de | 2 ++ initramfs/stage3-stuff/init | 3 ++ 6 files changed, 32 insertions(+), 24 deletions(-) (limited to 'initramfs') diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default index eefc0fda..d27d5623 100644 --- a/initramfs/distro-specs/suse/functions-default +++ b/initramfs/distro-specs/suse/functions-default @@ -39,6 +39,7 @@ config_distro () { for dir in rc0.d rc1.d rc2.d rc3.d rc4.d rc5.d rc6.d boot.d ; do rm -rf /mnt/etc/init.d/${dir}/* done + # link the additional key setup (notbook special keys) grep -q -E "otebook" /etc/hwinfo.bios && \ [ -e /mnt/etc/init.d/hotkey-setup ] && rllinker "hotkey-setup" 25 25 @@ -474,9 +475,9 @@ dlocale () { echo -e "\t# entries added by $0: $date" >> /mnt/etc/init.d/boot.slx sed -e "s,KEYTABLE=.*,KEYTABLE=\"${KEYTABLE}\"," \ -i /mnt/etc/sysconfig/keyboard -echo -e "\tloadkeys ${KEYTABLE} >${LOGFILE} 2>&1\n" \ +echo -e "\t#loadkeys ${KEYTABLE} >${LOGFILE} 2>&1\n" \ >>/mnt/etc/init.d/boot.slx -echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1\n" \ +echo -e "\t#setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1\n" \ >>/mnt/etc/init.d/boot.slx sed -e "s,RC_LANG=.*,RC_LANG=\"${LANG}\" # added in initrd," \ -i /mnt/etc/sysconfig/language diff --git a/initramfs/stage3-stuff/bin/servconfig b/initramfs/stage3-stuff/bin/servconfig index 4fe85f2c..96c6a612 100755 --- a/initramfs/stage3-stuff/bin/servconfig +++ b/initramfs/stage3-stuff/bin/servconfig @@ -91,8 +91,10 @@ if [ -z "${country}" ] ; then error "$scfg_country" nonfatal country="us" fi -# do localization (this functions starts a distro specific setup) +# do localization (this functions simply sets a list of variables) localization "${country}" +# start distrospecific localization +dlocale ############################################################################# # setup passwd and shadow for local system users like root, bin, daemon and diff --git a/initramfs/stage3-stuff/etc/functions b/initramfs/stage3-stuff/etc/functions index f28dba32..5307b20f 100644 --- a/initramfs/stage3-stuff/etc/functions +++ b/initramfs/stage3-stuff/etc/functions @@ -552,7 +552,7 @@ case "$country" in # German version de*) COUNTRY="de" - LANG="de_DE.UTF8" + LANG="de_DE.UTF-8" KEYTABLE="de-latin1-nodeadkeys" XKEYBOARD="de" KDEKEYBOARD="de" @@ -610,7 +610,7 @@ case "$country" in cs|cz) LANGUAGE="cs" COUNTRY="cs" - LANG="cs_CZ" + LANG="cs_CZ.UTF-8" KEYTABLE="cz-lat2" XKEYBOARD="cs" KDEKEYBOARD="cz" @@ -622,7 +622,7 @@ case "$country" in # Denmark dk|da) COUNTRY="dk" - LANG="da_DK" + LANG="da_DK.UTF-8" # Workaround: "dk" broken in gettext, use da:da_DK LANGUAGE="da:da_DK" KEYTABLE="dk" @@ -634,8 +634,8 @@ case "$country" in ;; es) # Spain - COUNTRY="es" - LANG="es_ES@euro" + COUNTRY="es.UTF-8" + LANG="es_ES" KEYTABLE="es" XKEYBOARD="es" KDEKEYBOARD="es" @@ -646,7 +646,7 @@ case "$country" in # Finland fi) COUNTRY="fi" - LANG="fi_FI@euro" + LANG="fi_FI.UTF-8" KEYTABLE="fi" XKEYBOARD="fi" KDEKEYBOARD="fi" @@ -657,7 +657,7 @@ case "$country" in # France fr*) COUNTRY="fr" - LANG="fr_FR@euro" + LANG="fr_FR.UTF-8" KEYTABLE="fr" XKEYBOARD="fr" KDEKEYBOARD="fr" @@ -669,7 +669,7 @@ case "$country" in # Hebrew version LANGUAGE="he" COUNTRY="il" - LANG="he_IL" + LANG="he_IL.UTF-8" KEYTABLE="us" XKEYBOARD="us" KDEKEYBOARD="il" @@ -680,7 +680,7 @@ case "$country" in # Ireland ie) COUNTRY="ie" - LANG="en_IE@euro" + LANG="en_IE.UTF-8" KEYTABLE="uk" XKEYBOARD="uk" KDEKEYBOARD="gb" @@ -691,7 +691,7 @@ case "$country" in # Italy it) COUNTRY="it" - LANG="it_IT@euro" + LANG="it_IT.UTF-8" KEYTABLE="it" XKEYBOARD="it" KDEKEYBOARD="it" @@ -702,7 +702,7 @@ case "$country" in # Japan ja) COUNTRY="jp" - LANG="ja_JP" + LANG="ja_JP.UTF-8" LANGUAGE="ja" KEYTABLE="us" XKEYBOARD="us" @@ -714,7 +714,7 @@ case "$country" in # The Netherlands nl) COUNTRY="nl" - LANG="nl_NL@euro" + LANG="nl_NL.UTF-8" KEYTABLE="us" XKEYBOARD="us" KDEKEYBOARD="en_US" @@ -725,7 +725,7 @@ case "$country" in # Poland pl) COUNTRY="pl" - LANG="pl_PL" + LANG="pl_PL.UTF-8" KEYTABLE="pl" XKEYBOARD="pl" KDEKEYBOARD="pl" @@ -737,7 +737,7 @@ case "$country" in # Russia ru) COUNTRY="ru" - LANG="ru_RU.KOI8-R" + LANG="ru_RU.UTF-8" KEYTABLE="ru" XKEYBOARD="ru" KDEKEYBOARD="ru" @@ -749,7 +749,7 @@ case "$country" in # Slovakia sk) COUNTRY="sk" - LANG="sk" + LANG="sk_SK.UTF-8" KEYTABLE="sk-qwerty" XKEYBOARD="sk" KDEKEYBOARD="sk" @@ -762,7 +762,7 @@ case "$country" in sl) LANGUAGE="sl" COUNTRY="si" - LANG="sl_SI" + LANG="sl_SI.UTF-8" KEYTABLE="slovene" XKEYBOARD="sl" KDEKEYBOARD="si" @@ -774,7 +774,7 @@ case "$country" in tr) # Turkish version (guessed) COUNTRY="tr" - LANG="tr_TR" + LANG="tr_TR.UTF-8" KEYTABLE="tr_q-latin5" XKEYBOARD="tr" KDEKEYBOARD="tr" @@ -785,7 +785,7 @@ case "$country" in # Taiwan - Traditional Chinese version tw) COUNTRY="tw" - LANG="zh_TW.Big5" + LANG="zh_TW.UTF-8" LANGUAGE="zh_TW.Big5" KEYTABLE="us" XKEYBOARD="us" @@ -798,7 +798,7 @@ case "$country" in # Great Britian uk) COUNTRY="uk" - LANG="en_GB" + LANG="en_GB.UTF-8" LANGUAGE="en" KEYTABLE="uk" XKEYBOARD="uk" @@ -820,8 +820,6 @@ case "$country" in TZ="America/New_York" ;; esac -# start distrospecific localization -dlocale } ############################################################################# diff --git a/initramfs/stage3-stuff/etc/messages b/initramfs/stage3-stuff/etc/messages index 813aa4b3..c7558e13 100644 --- a/initramfs/stage3-stuff/etc/messages +++ b/initramfs/stage3-stuff/etc/messages @@ -68,6 +68,8 @@ see\n this message add the token(s) 'noaufs'/'nounionfs' to your kernel \ command\n line or remove the modules from your kernel module directory." init_loadunions=" Stacking of directories failed, because UnionFS/AUFS is not \ loaded." +init_deselau=" You switched off AUFS and UnionFS via kernel commandline, thus \ +no module\n was loaded, using traditional bind mounts." init_loadcow=" Loading of Copy On Write (COW - special block device) module \ failed -\n Either module is not present or module does not match the \ running\n kernel. If you do not want to see this message remove the token \ diff --git a/initramfs/stage3-stuff/etc/messages.de b/initramfs/stage3-stuff/etc/messages.de index 24e04ff2..1651b595 100644 --- a/initramfs/stage3-stuff/etc/messages.de +++ b/initramfs/stage3-stuff/etc/messages.de @@ -69,6 +69,8 @@ init_loadaufs=" Laden von AUFS/UnionFS schlug fehl - entweder das Modul ist \ nicht vorhanden, oder\n es passt nicht zum laufenden Kernel. Wenn Sie diese \ Meldung nicht sehen\n wollen, fügen Sie das Token 'noaufs'/'nounionfs' den \ Kernel Start\n Optionen hinzu oder loeschen Sie die Module." +init_deselau=" Sie haben AUFS und UnionFS mittels Kernel-Commandline \ +ausgeschaltet, deshalb\n wurde kein entsprechendes Kernel-Modul geladen." init_loadcow=" Laden von Copy On Write (COW - Spezielles Block Geraet) Modul \ schlug fehl -\n entweder das Modul nicht praesent oder es passt nicht zum \ laufenden\n Kernel. Wenn Sie diese Meldung nicht sehen wollen, entfernen sie \ diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init index ec868f79..34f0c403 100755 --- a/initramfs/stage3-stuff/init +++ b/initramfs/stage3-stuff/init @@ -684,6 +684,9 @@ if [ ${aufs} -eq 1 ] && \ elif [ ${unionfs} -eq 1 ] && \ modprobe ${MODPRV} unionfs 2>/dev/null && \ lsmod | grep -qe "^unionfs" ; then union_type="UnionFS" +elif [ ${aufs} -eq 0 -a ${unionfs} -eq 0 -a -z "${cowloop}" ] ; then + error "$init_deselau" nonfatal + unset aufs unionfs else error "$init_loadaufs" nonfatal unset aufs unionfs -- cgit v1.2.3-55-g7522