mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-22 13:33:56 +03:00
factory: populate /etc/locale.conf with systemd build-time setting
This adds /etc/locale.conf to the set of configuration files populated by tmpfiles.d factory /etc handling. In particular, the build-time locale configuration in systemd is now wired to a /usr factory file, and installed to the system. On boot, if other locale customization tools did not write /etc/locale.conf on the system, the factory default file gets copied to /etc by systemd-tmpfiles. This is done in order to avoid skews between different system components when no locale settings are configured. At that point, systemd can safely act as the fallback owner of /etc/locale.conf.
This commit is contained in:
parent
8f7a0fcbec
commit
623370e643
1
factory/templates/locale.conf.in
Normal file
1
factory/templates/locale.conf.in
Normal file
@ -0,0 +1 @@
|
||||
LANG="{{ SYSTEMD_DEFAULT_LOCALE }}"
|
11
factory/templates/meson.build
Normal file
11
factory/templates/meson.build
Normal file
@ -0,0 +1,11 @@
|
||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
factory_etc_dir = factorydir / 'etc'
|
||||
|
||||
custom_target(
|
||||
'locale.conf',
|
||||
input : 'locale.conf.in',
|
||||
output : 'locale.conf',
|
||||
command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'],
|
||||
install : true,
|
||||
install_dir : factory_etc_dir)
|
@ -64,14 +64,14 @@
|
||||
might be checked for locale configuration as well, however only as
|
||||
fallback.</para>
|
||||
|
||||
<para><filename>/etc/locale.conf</filename> is usually created and updated
|
||||
<para><filename>/etc/locale.conf</filename> can be updated
|
||||
using
|
||||
<citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
|
||||
<citerefentry project='man-pages'><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
||||
may be used to alter the settings in this file during runtime from
|
||||
the command line. Use
|
||||
<citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
||||
to initialize them on mounted (but not booted) system images.</para>
|
||||
to customize them on mounted (but not booted) system images.</para>
|
||||
</refsect1>
|
||||
|
||||
<refsect1>
|
||||
|
@ -3707,6 +3707,7 @@ subdir('docs/var-log')
|
||||
|
||||
install_subdir('factory/etc',
|
||||
install_dir : factorydir)
|
||||
subdir('factory/templates')
|
||||
|
||||
if install_sysconfdir
|
||||
install_data('xorg/50-systemd-user.sh',
|
||||
|
@ -12,6 +12,7 @@ L+ /etc/mtab - - - - ../proc/self/mounts
|
||||
{% if HAVE_SMACK_RUN_LABEL %}
|
||||
t /etc/mtab - - - - security.SMACK64=_
|
||||
{% endif %}
|
||||
C! /etc/locale.conf - - - -
|
||||
C! /etc/nsswitch.conf - - - -
|
||||
{% if HAVE_PAM %}
|
||||
C! /etc/pam.d - - - -
|
||||
|
Loading…
Reference in New Issue
Block a user