diff options
| author | Colin Guthrie <colin@mageia.org> | 2015-02-08 19:07:47 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2015-02-08 21:19:21 +0000 |
| commit | 6879c7524e599ae82311c03c89bd43286e60868a (patch) | |
| tree | 6eb28ee7c620f3a6929555f6b6ad182055c22639 | |
| parent | d4be53b62716ec14020f5c29bd68fd9c0ab8d27e (diff) | |
| download | drakx-6879c7524e599ae82311c03c89bd43286e60868a.tar drakx-6879c7524e599ae82311c03c89bd43286e60868a.tar.gz drakx-6879c7524e599ae82311c03c89bd43286e60868a.tar.bz2 drakx-6879c7524e599ae82311c03c89bd43286e60868a.tar.xz drakx-6879c7524e599ae82311c03c89bd43286e60868a.zip | |
finish-install: Ensure i18n settings are loaded
In the past, we would simply reload the DM, but support for reloading
the dm was removed in draklive-config in 8fbe674e.
While we may still wan to reload the DM, we should at least try to
reload/re-export the i18n settings to give them the best chance of
taking effect.
| -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 |