[or-cvs] r13556: Updated tons of locale related configurations and scripts. A (in incognito/trunk: arch/x86 arch/x86/overlay/isolinux root_overlay/etc root_overlay/etc/init.d root_overlay/var/lib/kdesession)
anonym at seul.org
anonym at seul.org
Mon Feb 18 17:45:38 UTC 2008
Author: anonym
Date: 2008-02-18 12:45:37 -0500 (Mon, 18 Feb 2008)
New Revision: 13556
Added:
incognito/trunk/root_overlay/etc/init.d/external-locale
Modified:
incognito/trunk/arch/x86/livecd-stage1.spec
incognito/trunk/arch/x86/livecd-stage2.spec
incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg
incognito/trunk/root_overlay/etc/init.d/external-config-setup
incognito/trunk/root_overlay/etc/locale.gen
incognito/trunk/root_overlay/var/lib/kdesession/kxkbrc
Log:
Updated tons of locale related configurations and scripts.
Added russian and arabic localization, and fixed the earlier hebrew addition.
Modified: incognito/trunk/arch/x86/livecd-stage1.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage1.spec 2008-02-18 12:54:48 UTC (rev 13555)
+++ incognito/trunk/arch/x86/livecd-stage1.spec 2008-02-18 17:45:37 UTC (rev 13556)
@@ -50,17 +50,20 @@
-gnome
-eds
krb4
+ linguas_ar
+ linguas_de
linguas_en
- linguas_ja
- linguas_de
linguas_es
linguas_fa
linguas_fr
+ linguas_he
linguas_it
+ linguas_ja
linguas_pt
+ linguas_ru
linguas_zh
-mudflap
-
+
livecd/packages:
app-admin/logrotate
app-admin/sudo
Modified: incognito/trunk/arch/x86/livecd-stage2.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage2.spec 2008-02-18 12:54:48 UTC (rev 13555)
+++ incognito/trunk/arch/x86/livecd-stage2.spec 2008-02-18 17:45:37 UTC (rev 13556)
@@ -34,6 +34,7 @@
cupsd|default
mixminion-smtp|default
external-config-setup|boot
+ external-locale|boot
macchanger|default
acpid|boot
gpm|boot
@@ -41,6 +42,7 @@
hidden-service|default
ntpd|default
ntp-client|default
+ keymaps|boot
# unionfs (genkernel 2.4.7) causes problems such as:
# 1. creating /etc/sysconfig/keyboard in /etc/init.d/external-config-setup
Modified: incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg
===================================================================
--- incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg 2008-02-18 12:54:48 UTC (rev 13555)
+++ incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg 2008-02-18 17:45:37 UTC (rev 13556)
@@ -15,21 +15,26 @@
F6 F6.msg
F7 F7.msg
+label gentoo-ar
+ menu label Arabic
+ kernel gentoo
+ append root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on dopcmcia quiet lang=ar keymap=ar
+
label gentoo-zh
menu label Chinese
kernel gentoo
- append root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on dopcmcia quiet lang=zh keymap=zh
+ append root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on dopcmcia quiet lang=zh
label gentoo-en
menu label English
menu default
kernel gentoo
- append root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on dopcmcia quiet
+ append root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on dopcmcia quiet lang=en keymap=us
label gentoo-fa
menu label Farsi
kernel gentoo
- append root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on dopcmcia quiet lang=fa keymap=fa
+ append root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on dopcmcia quiet lang=fa
label gentoo-fr
menu label French
@@ -44,7 +49,7 @@
label gentoo-he
menu label Hebrew
kernel gentoo
- append root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on dopcmcia quiet lang=de keymap=he
+ append root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on dopcmcia quiet lang=he keymap=il
label gentoo-it
menu label Italian
@@ -54,15 +59,19 @@
label gentoo-ja
menu label Japanese
kernel gentoo
- append root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on dopcmcia quiet lang=ja keymap=ja
+ append root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on dopcmcia quiet lang=ja keymap=jp
label gentoo-pt
menu label Portuguese
kernel gentoo
append root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on dopcmcia quiet lang=pt keymap=pt
+label gentoo-ru
+ menu label Russian
+ kernel gentoo
+ append root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on dopcmcia quiet lang=ru keymap=ru
+
label gentoo-es
menu label Spanish
kernel gentoo
append root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on dopcmcia quiet lang=es keymap=es
-
Modified: incognito/trunk/root_overlay/etc/init.d/external-config-setup
===================================================================
--- incognito/trunk/root_overlay/etc/init.d/external-config-setup 2008-02-18 12:54:48 UTC (rev 13555)
+++ incognito/trunk/root_overlay/etc/init.d/external-config-setup 2008-02-18 17:45:37 UTC (rev 13556)
@@ -8,168 +8,123 @@
HOMEPART_TC="${MEDIAROOT}/home.tc"
depend() {
- need localmount
- before xdm
+ need localmount
+ before xdm
}
start() {
- # Language
- for P in $(</proc/cmdline); do echo ${P} | sed 's/=/ /'; done | while read A X; do
- if [[ "${A}" == "lang" && -n "${X}" ]]; then
- ebegin "Setting language to ${X}"
-
- cat > /etc/env.d/02locale <<EOF
-LANG="${X}"
-LC_ALL="${X}"
-EOF
- /sbin/env-update.sh > /dev/null
-
- MOZILLA_FIVE_HOME="/opt/firefox"
- if [[ -w "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js ]]; then
- sed -i "s:general.useragent.locale\", \".*\":general.useragent.locale\", \"${X}\":" \
- "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
- "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox-l10n.js 2>/dev/null
- fi
- ls /home/gentoo/.mozilla/firefox/*/prefs.js /home/gentoo/.thunderbird/*/prefs.js 2>/dev/null | while read PREFS; do
- echo "user_pref(\"general.useragent.locale\", \"${X}\");" >> "${PREFS}"
- done
-
- KXKBRC="/home/gentoo/.kde3.5/share/config/kxkbrc"
- if [[ -w "${KXKBRC}" ]]; then
- sed -i "s:=${X},\?:=:" "${KXKBRC}"
- sed -i "s:,${X}::" "${KXKBRC}"
- sed -i "s:LayoutList=:LayoutList=${X},:" "${KXKBRC}"
- fi
-
- eend 0
- fi
- if [[ "${A}" == "keymap" && -n "${X}" && ! -e "/etc/sysconfig/keyboard" ]]; then
- # Missing /etc/sysconfig/keyboard implies initramfs script did not set a keymap
- mkdir -p /etc/sysconfig
- echo "XKEYBOARD=${X}" > /etc/sysconfig/keyboard
- sed -i "s/KEYMAP=\"us\"/KEYMAP=\"${X}\"/" /etc/conf.d/keymaps
- fi
- done
- if [[ -e "/etc/sysconfig/keyboard" ]]; then
- source /etc/sysconfig/keyboard
- [[ -n "${XKEYBOARD}" ]] && sed -i "s/KEYMAP=\"us\"/KEYMAP=\"${XKEYBOARD}\"/" /etc/conf.d/keymaps
+ # User specific config
+ export MEDIAFREE="$(df -k -P "${MEDIAROOT}" | tail -n 1 | awk '{ print $4 }')"
+ einfo "Found ${MEDIAFREE}k free on ${MEDIAROOT}"
+ if [[ -d "${MEDIAROOT}" ]]; then
+ # Remount media rw
+ mount -o rw,remount ${MEDIAROOT} >/dev/null 2>&1
+ if [[ "${MEDIAFREE}" -gt 24576 && ! -f "${HOMEPART_EXT3}" && ! -f "${HOMEPART_TC}" ]]; then
+ # Check if really writeable
+ touch "${MEDIAROOT}/writetest" >/dev/null 2>/dev/null
+ if [[ -f "${MEDIAROOT}/writetest" ]]; then
+ rm "${MEDIAROOT}/writetest"
+ splash_verbose
+ clear
+ /usr/sbin/create-homevol
+ clear
+ splash_silent
+ fi
fi
- [[ -f "/etc/env.d/02locale" ]] && source /etc/env.d/02locale
+ fi
- # User specific config
- export MEDIAFREE="$(df -k -P "${MEDIAROOT}" | tail -n 1 | awk '{ print $4 }')"
- einfo "Found ${MEDIAFREE}k free on ${MEDIAROOT}"
- if [[ -d "${MEDIAROOT}" ]]; then
- # Remount media rw
- mount -o rw,remount ${MEDIAROOT} >/dev/null 2>&1
- if [[ "${MEDIAFREE}" -gt 24576 && ! -f "${HOMEPART_EXT3}" && ! -f "${HOMEPART_TC}" ]]; then
- # Check if really writeable
- touch "${MEDIAROOT}/writetest" >/dev/null 2>/dev/null
- if [[ -f "${MEDIAROOT}/writetest" ]]; then
- rm "${MEDIAROOT}/writetest"
- splash_verbose
- clear
- /usr/sbin/create-homevol
- clear
- splash_silent
- fi
- fi
- fi
+ if [[ -w "${HOMEPART_TC}" ]]; then
+ ebegin "Mounting TrueCrypt /home"
+ clear
+ splash_verbose
+ BACKTITLE="__INCOGNITO__"
+ LABEL_PASSWORD="Password"
+ LABEL_OPT_PWD="Optional password"
+ QUESTION_PASSWORD="Please enter the password(s) for the home volume, or choose cancel to boot with default settings and no persistent storage.
- if [[ -w "${HOMEPART_TC}" ]]; then
- ebegin "Mounting TrueCrypt /home"
- clear
- splash_verbose
- BACKTITLE="__INCOGNITO__"
- LABEL_PASSWORD="Password"
- LABEL_OPT_PWD="Optional password"
- QUESTION_PASSWORD="Please enter the password(s) for the home volume, or choose cancel to boot with default settings and no persistent storage.
-
To get standard access to a volume, enter the appropriate password in the '${LABEL_PASSWORD}' field and leave the ${LABEL_OPT_PWD} blank. For example, if you do NOT have a hidden volume, you should always simply enter your single password in the '${LABEL_PASSWORD}' field. If you have a hidden volume and want to access it you instead enter the hidden volume password in the '${LABEL_PASSWORD}' field.
If you have a hidden volume but want to access the normal volume safely, enter the normal volume password in the '${LABEL_PASSWORD}' field and the hidden volume password in the '${LABEL_OPT_PWD}' field. If you enter the normal volume password without entering the hidden volume password in this way you risk corrupting the hidden volume and make it inaccessible."
- QUESTION_ERROR="An error occurred opening the volume, see above, hit Enter/Return to try again"
- TITLE="Open Persistent Home Volume"
- # Ask for truecrypt password, use password from creating (hidden volume preferred) if available
- while true; do
- dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --insecure --passwordform "${QUESTION_PASSWORD}" 0 0 0 "${LABEL_PASSWORD}" 1 0 "" 2 0 40 1024 "${LABEL_OPT_PWD}" 4 0 "" 5 0 40 1024 2>/tmp/dialog
- if [[ $? -ne 0 ]]; then
- clear
- rm /tmp/dialog
- break
- fi
- clear
- TRUECRYPT_PW1="$( tail -n 2 /tmp/dialog | head -n 1 )"
- TRUECRYPT_PW2="$( tail -n 1 /tmp/dialog )"
- rm /tmp/dialog
- # if we got two passwords, try mounting the normal volume safely, otherwise mount normally
- if [[ -z ${TRUECRYPT_PW2} ]]; then
- truecrypt --keyfile "" --password "${TRUECRYPT_PW1}" "${HOMEPART_TC}" /home
- else
- truecrypt --protect-hidden --keyfile "" --keyfile "" --password "${TRUECRYPT_PW1}" --password "${TRUECRYPT_PW2}" "${HOMEPART_TC}" /home
- fi
+ QUESTION_ERROR="An error occurred opening the volume, see above, hit Enter/Return to try again"
+ TITLE="Open Persistent Home Volume"
+ # Ask for truecrypt password, use password from creating (hidden volume preferred) if available
+ while true; do
+ dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --insecure --passwordform "${QUESTION_PASSWORD}" 0 0 0 "${LABEL_PASSWORD}" 1 0 "" 2 0 40 1024 "${LABEL_OPT_PWD}" 4 0 "" 5 0 40 1024 2>/tmp/dialog
+ if [[ $? -ne 0 ]]; then
+ clear
+ rm /tmp/dialog
+ break
+ fi
+ clear
+ TRUECRYPT_PW1="$( tail -n 2 /tmp/dialog | head -n 1 )"
+ TRUECRYPT_PW2="$( tail -n 1 /tmp/dialog )"
+ rm /tmp/dialog
+ # if we got two passwords, try mounting the normal volume safely, otherwise mount normally
+ if [[ -z ${TRUECRYPT_PW2} ]]; then
+ truecrypt --keyfile "" --password "${TRUECRYPT_PW1}" "${HOMEPART_TC}" /home
+ else
+ truecrypt --protect-hidden --keyfile "" --keyfile "" --password "${TRUECRYPT_PW1}" --password "${TRUECRYPT_PW2}" "${HOMEPART_TC}" /home
+ fi
- if [[ $? -eq 0 ]]; then
- touch /var/state/boot-media-home
- break
- fi
- echo
- echo "*** ${QUESTION_ERROR} ***"
- echo
- read TMP
- done
- splash_silent
- eend 0
- elif [[ -w "${HOMEPART_EXT3}" ]]; then
- ebegin "Mounting boot media /home"
- mount -o rw,remount ${MEDIAROOT} >/dev/null 2>&1
- mount -o loop -t ext3 "${HOMEPART_EXT3}" /home && touch /var/state/boot-media-home
- eend $?
+ if [[ $? -eq 0 ]]; then
+ touch /var/state/boot-media-home
+ break
+ fi
+ echo
+ echo "*** ${QUESTION_ERROR} ***"
+ echo
+ read TMP
+ done
+ splash_silent
+ eend 0
+ elif [[ -w "${HOMEPART_EXT3}" ]]; then
+ ebegin "Mounting boot media /home"
+ mount -o rw,remount ${MEDIAROOT} >/dev/null 2>&1
+ mount -o loop -t ext3 "${HOMEPART_EXT3}" /home && touch /var/state/boot-media-home
+ eend $?
+ fi
+ if [[ ! -e /var/state/boot-media-home ]]; then
+ ebegin "Copying user config from boot media to /home/gentoo"
+ mkdir -p /home/gentoo/.kde3.5/share/config
+ [[ -f ${MEDIAROOT}/config/kopeterc ]] && cp ${MEDIAROOT}/config/kopeterc /home/gentoo/.kde3.5/share/config
+ if [[ -d ${MEDIAROOT}/keys/ssh ]]; then
+ cp -a ${MEDIAROOT}/keys/ssh /home/gentoo/.ssh
+ chown -R gentoo:users /home/gentoo/.ssh
+ chmod 700 /home/gentoo/.ssh
fi
- if [[ ! -e /var/state/boot-media-home ]]; then
- ebegin "Copying user config from boot media to /home/gentoo"
- mkdir -p /home/gentoo/.kde3.5/share/config
- [[ -f ${MEDIAROOT}/config/kopeterc ]] && cp ${MEDIAROOT}/config/kopeterc /home/gentoo/.kde3.5/share/config
- if [[ -d ${MEDIAROOT}/keys/ssh ]]; then
- cp -a ${MEDIAROOT}/keys/ssh /home/gentoo/.ssh
- chown -R gentoo:users /home/gentoo/.ssh
- chmod 700 /home/gentoo/.ssh
- fi
- eend 0
- fi
-
- # System wide config
- ebegin "Copying system config from boot media"
- [[ -d ${MEDIAROOT}/keys/openvpn ]] && cp -a ${MEDIAROOT}/keys/openvpn /etc
eend 0
+ fi
- # Ensure correct user dir permissions
- if [[ ! -f /var/state/boot-media-home ]]; then
- ebegin "Fixing permissions on /home"
- for USERDIR in /home/*; do
- chown -R ${USERDIR/\/home\//}:users $USERDIR
- find $USERDIR -type f -print0 | xargs -0 chmod u+rw
- done
- eend 0
+ # System wide config
+ ebegin "Copying system config from boot media"
+ [[ -d ${MEDIAROOT}/keys/openvpn ]] && cp -a ${MEDIAROOT}/keys/openvpn /etc
+ eend 0
+
+ # Ensure correct user dir permissions
+ if [[ ! -f /var/state/boot-media-home ]]; then
+ ebegin "Fixing permissions on /home"
+ for USERDIR in /home/*; do
+ chown -R ${USERDIR/\/home\//}:users $USERDIR
+ find $USERDIR -type f -print0 | xargs -0 chmod u+rw
+ done
+ eend 0
fi
- chown -R root /root
+ chown -R root /root
- # If using 'docache' we are done with the boot media, eject it
- CD_DEV="$(eject -n | sed 's:.*\(/dev/[A-Za-z0-9]*\).*:\1:')"
- [[ ! -f /var/state/boot-media-home ]] && grep docache /proc/cmdline >/dev/null && [[ -n "${CD_DEV}" ]] && grep "${CD_DEV}" /proc/mounts >/dev/null && eject
+ # If using 'docache' we are done with the boot media, eject it
+ CD_DEV="$(eject -n | sed 's:.*\(/dev/[A-Za-z0-9]*\).*:\1:')"
+ [[ ! -f /var/state/boot-media-home ]] && grep docache /proc/cmdline >/dev/null && [[ -n "${CD_DEV}" ]] && grep "${CD_DEV}" /proc/mounts >/dev/null && eject
- # The previous line could return a false value which is OK, but should not fail the service
- true
+ # The previous line could return a false value which is OK, but should not fail the service
+ true
}
stop() {
- if [[ -f /var/state/boot-media-home ]]; then
- ebegin "Unmounting boot media /home"
- umount /home && rm /var/state/boot-media-home
- eend $?
- fi
+ if [[ -f /var/state/boot-media-home ]]; then
+ ebegin "Unmounting boot media /home"
+ umount /home && rm /var/state/boot-media-home
+ eend $?
+ fi
}
-
-# vim:ts=4
Added: incognito/trunk/root_overlay/etc/init.d/external-locale
===================================================================
--- incognito/trunk/root_overlay/etc/init.d/external-locale (rev 0)
+++ incognito/trunk/root_overlay/etc/init.d/external-locale 2008-02-18 17:45:37 UTC (rev 13556)
@@ -0,0 +1,64 @@
+#!/sbin/runscript
+
+# Set language chosen from the boot menu as the locale
+
+depend() {
+ need localmount
+ before xdm keymaps
+}
+
+start() {
+ for P in $(</proc/cmdline); do echo ${P} | sed 's/=/ /'; done | while read TMP LANGUAGE; do
+ if [[ "${TMP}" == "lang" && -n "${LANGUAGE}" ]]; then
+ ebegin "Setting locale to ${LANGUAGE}"
+
+ LOCALE=$(grep -m 1 -o -e "^${LANGUAGE}.*\.UTF-8" /etc/locale.gen)
+
+ cat > /etc/env.d/02locale <<EOF
+LANGUAGE="${LOCALE}"
+LANG="${LOCALE}"
+LC_ALL="${LOCALE}"
+EOF
+ /sbin/env-update.sh > /dev/null
+
+ # Localize mozilla
+ MOZILLA_FIVE_HOME="/opt/firefox"
+ if [[ -w "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js ]]; then
+ sed -i "s:general.useragent.locale\", \".*\":general.useragent.locale\", \"${LANGUAGE}\":" \
+ "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
+ "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox-l10n.js 2>/dev/null
+ fi
+ ls /home/gentoo/.mozilla/firefox/*/prefs.js /home/gentoo/.thunderbird/*/prefs.js 2>/dev/null | while read PREFS; do
+ echo "user_pref(\"general.useragent.locale\", \"${LANGUAGE}\");" >> "${PREFS}"
+ done
+
+ # Localize KDE
+ case "${LANGUAGE}" in
+ "ar") XKB_LANG="ara";;
+ "fa") XKB_LANG="ir";;
+ "he") XKB_LANG="il";;
+ *) XKB_LANG="${LANGUAGE}";;
+ esac
+
+ KXKBRC="/home/gentoo/.kde3.5/share/config/kxkbrc"
+ if [[ -w "${KXKBRC}" ]]; then
+ sed -i "s:=${XKB_LANG},\?:=:" "${KXKBRC}"
+ sed -i "s:,${XKB_LANG}::" "${KXKBRC}"
+ sed -i "s:LayoutList=:LayoutList=${XKB_LANG},:" "${KXKBRC}"
+ fi
+
+ eend 0
+ fi
+ if [[ "${TMP}" == "keymap" && -n "${LANGUAGE}" && ! -e "/etc/sysconfig/keyboard" ]]; then
+ # Missing /etc/sysconfig/keyboard implies initramfs script did not set a keymap
+ mkdir -p /etc/sysconfig
+ echo "XKEYBOARD=${LANGUAGE}" > /etc/sysconfig/keyboard
+ sed -i "s/KEYMAP=\"us\"/KEYMAP=\"${LANGUAGE}\"/" /etc/conf.d/keymaps
+ fi
+ done
+ if [[ -e "/etc/sysconfig/keyboard" ]]; then
+ source /etc/sysconfig/keyboard
+ [[ -n "${XKEYBOARD}" ]] && sed -i "s/KEYMAP=\".*\"/KEYMAP=\"${XKEYBOARD}\"/" /etc/conf.d/keymaps
+ fi
+ [[ -f "/etc/env.d/02locale" ]] && source /etc/env.d/02locale
+}
Modified: incognito/trunk/root_overlay/etc/locale.gen
===================================================================
--- incognito/trunk/root_overlay/etc/locale.gen 2008-02-18 12:54:48 UTC (rev 13555)
+++ incognito/trunk/root_overlay/etc/locale.gen 2008-02-18 17:45:37 UTC (rev 13556)
@@ -15,30 +15,12 @@
# rebuilt for you. After updating this file, you can simply run `locale-gen`
# yourself instead of re-emerging glibc.
-#en_AU.UTF-8 UTF-8
-#en_AU ISO-8859-1
+ar_EG.UTF-8 UTF-8
+ar_EG ISO-8859-6
-#en_CA.UTF-8 UTF-8
-#en_CA ISO-8859-1
-
-en_GB.UTF-8 UTF-8
-en_GB ISO-8859-1
-
en_US.UTF-8 UTF-8
en_US ISO-8859-1
-#en_HK.UTF-8 UTF-8
-#en_HK ISO-8859-1
-
-#en_PH.UTF-8 UTF-8
-#en_PH ISO-8859-1
-
-#en_SG.UTF-8 UTF-8
-#en_SG ISO-8859-1
-
-ja_JP.EUC-JP EUC-JP
-ja_JP.UTF-8 UTF-8
-
de_DE.UTF-8 UTF-8
de_DE ISO-8859-1
de_DE at euro ISO-8859-15
@@ -47,14 +29,8 @@
es_ES ISO-8859-1
es_ES at euro ISO-8859-15
-#es_MX.UTF-8 UTF-8
-#es_MX ISO-8859-1
+fa_IR.UTF-8 UTF-8
-fa_IR UTF-8
-
-#fr_CA.UTF-8 UTF-8
-#fr_CA ISO-8859-1
-
fr_FR.UTF-8 UTF-8
fr_FR ISO-8859-1
fr_FR at euro ISO-8859-15
@@ -63,15 +39,49 @@
it_IT ISO-8859-1
it_IT at euro ISO-8859-15
+ja_JP.EUC-JP EUC-JP
+ja_JP.UTF-8 UTF-8
+
pt_PT.UTF-8 UTF-8
pt_PT ISO-8859-1
pt_PT at euro ISO-8859-15
+ru_RU.KOI8-R KOI8-R
+ru_RU.UTF-8 UTF-8
+ru_RU ISO-8859-5
+
zh_CN.GB18030 GB18030
zh_CN.GBK GBK
zh_CN.UTF-8 UTF-8
zh_CN GB2312
+he_IL.UTF-8 UTF-8
+he_IL ISO-8859-8
+
+#en_AU.UTF-8 UTF-8
+#en_AU ISO-8859-1
+
+#en_CA.UTF-8 UTF-8
+#en_CA ISO-8859-1
+
+#en_GB.UTF-8 UTF-8
+#en_GB ISO-8859-1
+
+#en_HK.UTF-8 UTF-8
+#en_HK ISO-8859-1
+
+#en_PH.UTF-8 UTF-8
+#en_PH ISO-8859-1
+
+#en_SG.UTF-8 UTF-8
+#en_SG ISO-8859-1
+
+#es_MX.UTF-8 UTF-8
+#es_MX ISO-8859-1
+
+#fr_CA.UTF-8 UTF-8
+#fr_CA ISO-8859-1
+
#zh_HK.UTF-8 UTF-8
#zh_HK BIG5-HKSCS
@@ -82,6 +92,3 @@
#zh_TW.EUC-TW EUC-TW
#zh_TW.UTF-8 UTF-8
#zh_TW BIG5
-
-he_IL.UTF-8 UTF-8
-he_IL ISO-8859-8
Modified: incognito/trunk/root_overlay/var/lib/kdesession/kxkbrc
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/kxkbrc 2008-02-18 12:54:48 UTC (rev 13555)
+++ incognito/trunk/root_overlay/var/lib/kdesession/kxkbrc 2008-02-18 17:45:37 UTC (rev 13556)
@@ -2,8 +2,8 @@
DisplayNames=
EnableXkbOptions=false
IncludeGroups=
-LayoutList=us,de,es,fr,it,jp,pt,ara,il
-Model=pc104
+LayoutList=us,de,es,fr,it,jp,pt,ru,ara,il,ir
+Model=pc105
Options=
ResetOldOptions=false
ShowFlag=true
More information about the tor-commits
mailing list