mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-09-22 13:45:21 +03:00
meson: Switch default-locale default to C.UTF-8
We're already using C.UTF-8 as the default locale for nspawn. Let's make the same change for the default-locale option instead of deciding what to use based on the locale used by the host system. Users can still override the locale using the default-locale option if needed.
This commit is contained in:
committed by
Yu Watanabe
parent
ea4f2d5fb7
commit
c9bd01ae90
@@ -929,15 +929,6 @@ ntp_servers = get_option('ntp-servers')
|
|||||||
conf.set_quoted('NTP_SERVERS', ntp_servers)
|
conf.set_quoted('NTP_SERVERS', ntp_servers)
|
||||||
|
|
||||||
default_locale = get_option('default-locale')
|
default_locale = get_option('default-locale')
|
||||||
if default_locale == ''
|
|
||||||
if not meson.is_cross_build()
|
|
||||||
choose_default_locale_sh = find_program('tools/choose-default-locale.sh')
|
|
||||||
default_locale = run_command(choose_default_locale_sh,
|
|
||||||
check : true).stdout().strip()
|
|
||||||
else
|
|
||||||
default_locale = 'C.UTF-8'
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
conf.set_quoted('SYSTEMD_DEFAULT_LOCALE', default_locale)
|
conf.set_quoted('SYSTEMD_DEFAULT_LOCALE', default_locale)
|
||||||
|
|
||||||
localegen_path = get_option('localegen-path')
|
localegen_path = get_option('localegen-path')
|
||||||
|
@@ -300,7 +300,7 @@ option('default-kill-user-processes', type : 'boolean',
|
|||||||
description : 'the default value for KillUserProcesses= setting')
|
description : 'the default value for KillUserProcesses= setting')
|
||||||
option('gshadow', type : 'boolean',
|
option('gshadow', type : 'boolean',
|
||||||
description : 'support for shadow group')
|
description : 'support for shadow group')
|
||||||
option('default-locale', type : 'string', value : '',
|
option('default-locale', type : 'string', value : 'C.UTF-8',
|
||||||
description : 'default locale used when /etc/locale.conf does not exist')
|
description : 'default locale used when /etc/locale.conf does not exist')
|
||||||
option('localegen-path', type : 'string', value : '',
|
option('localegen-path', type : 'string', value : '',
|
||||||
description : 'absolute path to the locale-gen binary in case the system is using locale-gen')
|
description : 'absolute path to the locale-gen binary in case the system is using locale-gen')
|
||||||
|
@@ -1,12 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# Fedora uses C.utf8 but Debian uses C.UTF-8
|
|
||||||
if locale -a | grep -xq -E 'C\.(utf8|UTF-8)'; then
|
|
||||||
echo 'C.UTF-8'
|
|
||||||
elif locale -a | grep -xqF 'en_US.utf8'; then
|
|
||||||
echo 'en_US.UTF-8'
|
|
||||||
else
|
|
||||||
echo 'C'
|
|
||||||
fi
|
|
Reference in New Issue
Block a user