X Tutup
Skip to content

Commit dac05c0

Browse files
committed
man: say that machine-info doesn't have to exist
Esp. CHASSIS is only useful as an override. Make that clear in the description. Fixes systemd#3496.
1 parent aa2e348 commit dac05c0

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

man/machine-info.xml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,10 @@
3737
file without implementing a shell compatible execution
3838
engine.</para>
3939

40-
<para><filename>/etc/machine-info</filename> contains metadata
41-
about the machine that is set by the user or administrator.</para>
42-
43-
<para>Depending on the operating system other configuration files
44-
might be checked for machine information as well, however only as
45-
fallback.</para>
40+
<para><filename>/etc/machine-info</filename> contains metadata about the machine that is set by the user
41+
or administrator. The settings configured here have the highest precedence. When not set, appropriate
42+
values may be determined automatically, based on the information about the hardware or other
43+
configuration files. It is thus completely fine for this file to not be present.</para>
4644

4745
<para>You may use
4846
<citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
@@ -102,13 +100,11 @@
102100
as well as the special chassis types
103101
<literal>vm</literal> and
104102
<literal>container</literal> for
105-
virtualized systems that lack an immediate physical chassis.
106-
Note that many systems allow detection of the chassis type
107-
automatically (based on firmware information or suchlike).
108-
This setting (if set) shall take precedence over automatically
109-
detected information and is useful to override misdetected
110-
configuration or to manually configure the chassis type where
111-
automatic detection is not available.</para></listitem>
103+
virtualized systems that lack an immediate physical chassis.</para>
104+
105+
<para>Note that most systems allow detection of the chassis type automatically (based on firmware
106+
information or suchlike). This setting should only be used to override a misdetection or to manually
107+
configure the chassis type where automatic detection is not available.</para></listitem>
112108
</varlistentry>
113109

114110
<varlistentry>

0 commit comments

Comments
 (0)
X Tutup