summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca BRUNO <luca.bruno@coreos.com>2021-12-23 12:35:26 +0000
committerLuca BRUNO <luca.bruno@coreos.com>2021-12-23 14:18:02 +0000
commit8e85924fd6c22dcbc883eda1116b27b218226dc9 (patch)
treea948429a2afaa4cffb7493a3a985431136c0bcd3
parent623370e643e228449f5e49c0d82e6e423ae0e0f7 (diff)
downloadsystemd-8e85924fd6c22dcbc883eda1116b27b218226dc9.tar.gz
factory/locale.conf: mention systemd ownership
This explicitly mentions that comments and empty lines are supported (and ignored) in /etc/locale.conf. It then adds ownership reference to the factory default.
-rw-r--r--factory/templates/locale.conf.in2
-rw-r--r--man/locale.conf.xml7
2 files changed, 7 insertions, 2 deletions
diff --git a/factory/templates/locale.conf.in b/factory/templates/locale.conf.in
index 421fd569a9..af93d043ec 100644
--- a/factory/templates/locale.conf.in
+++ b/factory/templates/locale.conf.in
@@ -1 +1,3 @@
+# This is the fallback locale configuration provided by systemd.
+
LANG="{{ SYSTEMD_DEFAULT_LOCALE }}"
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index fe263fcfd8..df19f1a435 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -32,7 +32,8 @@
<para>The basic file format of <filename>locale.conf</filename> is
a newline-separated list of environment-like shell-compatible
- variable assignments. It is possible to source the configuration
+ variable assignments, ignoring comments and empty lines.
+ It is possible to source the configuration
from shell scripts, however, beyond mere variable assignments, no
shell features are supported, allowing applications to read the
file without implementing a shell compatible execution
@@ -107,7 +108,9 @@
<para><filename>/etc/locale.conf</filename>:</para>
- <programlisting>LANG=de_DE.UTF-8
+ <programlisting># Custom settings
+
+LANG=de_DE.UTF-8
LC_MESSAGES=en_US.UTF-8</programlisting>
</example>