X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fmachine-info.xml;h=ddf8f8b3d029a6cfa73b5b5bdc0637565c1ebe47;hb=e44127018aaae2126734aca65a3e46dc14bf1825;hp=e27b600211eb2c1a77457b06f60c333e89463ed6;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git
diff --git a/man/machine-info.xml b/man/machine-info.xml
index e27b60021..ddf8f8b3d 100644
--- a/man/machine-info.xml
+++ b/man/machine-info.xml
@@ -74,6 +74,11 @@
Depending on the operating system other
configuration files might be checked for machine
information as well, however only as fallback.
+
+ You may use
+ hostnamectl1
+ to change the settings of this file from the command
+ line.
@@ -89,22 +94,22 @@
PRETTY_HOSTNAME=
A pretty
- human-readable UTF8 machine identifier
+ human-readable UTF-8 machine identifier
string. This should contain a name
like Lennart's
Laptop which is useful to
present to the user and does not
suffer by the syntax limitations of
- internet domain names. If possible the
- internet host name as configured in
+ internet domain names. If possible, the
+ internet hostname as configured in
/etc/hostname
should be kept similar to this
one. Example: if this value is
Lennart's Computer
- an Internet host name of
+ an Internet hostname of
lennarts-computer
might be a good choice. If this
- parameter is not set an application
+ parameter is not set, an application
should fall back to the Internet host
name for presentation
purposes.
@@ -117,12 +122,40 @@
this machine according to the XDG
Icon Naming Specification. If
- this parameter is not set an
+ this parameter is not set, an
application should fall back to
computer or a
similar icon name.
+
+ CHASSIS=
+
+ The chassis
+ type. Currently, the following chassis
+ types are defined:
+ desktop,
+ laptop,
+ server,
+ tablet,
+ handset, as well as
+ the special chassis types
+ vm and
+ container for
+ virtualized systems that lack an
+ immediate physical chassis. Note that
+ many systems allow detection of the
+ chassis type automatically (based on
+ firmware information or
+ suchlike). This setting (if set) shall
+ take precedence over automatically
+ detected information and is useful to
+ override misdetected configuration or
+ to manually configure the chassis type
+ where automatic detection is not
+ available.
+
+
@@ -130,8 +163,9 @@
Example
- PRETTY_HOSTNAME="Lennart's Computer"
-ICON_NAME=computer-laptop
+ PRETTY_HOSTNAME="Lennart's Tablet"
+ICON_NAME=computer-tablet
+CHASSIS=tablet
@@ -140,7 +174,9 @@ ICON_NAME=computer-laptop
systemd1,
os-release5,
hostname5,
- machine-id5
+ machine-id5,
+ hostnamectl1,
+ systemd-hostnamed.service8