summaryrefslogtreecommitdiffstats
path: root/factory
diff options
context:
space:
mode:
authorLuca BRUNO <luca.bruno@coreos.com>2021-12-23 12:01:07 +0100
committerLuca BRUNO <luca.bruno@coreos.com>2021-12-23 12:01:12 +0100
commit623370e643e228449f5e49c0d82e6e423ae0e0f7 (patch)
treebe67f5ff16f8501b3970c3d48b6f5c9ee208eb0f /factory
parentmeson: fix typo (diff)
downloadsystemd-623370e643e228449f5e49c0d82e6e423ae0e0f7.tar.xz
systemd-623370e643e228449f5e49c0d82e6e423ae0e0f7.zip
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.
Diffstat (limited to 'factory')
-rw-r--r--factory/templates/locale.conf.in1
-rw-r--r--factory/templates/meson.build11
2 files changed, 12 insertions, 0 deletions
diff --git a/factory/templates/locale.conf.in b/factory/templates/locale.conf.in
new file mode 100644
index 0000000000..421fd569a9
--- /dev/null
+++ b/factory/templates/locale.conf.in
@@ -0,0 +1 @@
+LANG="{{ SYSTEMD_DEFAULT_LOCALE }}"
diff --git a/factory/templates/meson.build b/factory/templates/meson.build
new file mode 100644
index 0000000000..821f176a74
--- /dev/null
+++ b/factory/templates/meson.build
@@ -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)