diff options
| -rwxr-xr-x | perl-install/standalone/finish-install.xsetup | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/perl-install/standalone/finish-install.xsetup b/perl-install/standalone/finish-install.xsetup index 1b53e9ff8..890560c28 100755 --- a/perl-install/standalone/finish-install.xsetup +++ b/perl-install/standalone/finish-install.xsetup @@ -5,19 +5,36 @@ if [ -f /etc/sysconfig/finish-install -a -x /usr/sbin/finish-install ]; then . /etc/sysconfig/finish-install if [ "$FINISH_INSTALL" = yes ]; then - if [ -r /etc/sysconfig/i18n -o -r /etc/locale.conf ]; then + if [ -r /etc/locale.conf -o -r /etc/sysconfig/i18n ]; then + unset LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \ + LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \ + LC_IDENTIFICATION if [ -r /etc/locale.conf ]; then . /etc/locale.conf else . /etc/sysconfig/i18n fi - export LANGUAGE LC_ADDRESS LC_COLLATE LC_NAME LC_NUMERIC LC_MEASUREMENT LC_TIME \ - LANG LC_IDENTIFICATION LC_MESSAGES LC_CTYPE LC_TELEPHONE LC_MONETARY LC_PAPER + export LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \ + LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \ + LC_IDENTIFICATION fi . /etc/profile.d/10mageia-release.sh xsetroot -cursor_name left_ptr /usr/sbin/finish-install + if [ -r /etc/locale.conf -o -r /etc/sysconfig/i18n ]; then + unset LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \ + LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \ + LC_IDENTIFICATION + if [ -r /etc/locale.conf ]; then + . /etc/locale.conf + else + . /etc/sysconfig/i18n + fi + export LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \ + LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \ + LC_IDENTIFICATION + fi # used in live systems, so that dm gets restarted with the new defaults - touch /var/lock/reload-dm + touch /run/lock/reload-dm fi fi |