X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fmachine-info.xml;h=7448e68fd4421fd715bbf00f32141a3e2f38c315;hb=e4e703c3076cb5060ab401a2370ab84883f2fd8f;hp=c6d3e92f9a0b2df9090cc7ff965db71f0de4f542;hpb=7640a5de1b3ffe6547200ad204d14e4f067caf4f;p=elogind.git
diff --git a/man/machine-info.xml b/man/machine-info.xml
index c6d3e92f9..7448e68fd 100644
--- a/man/machine-info.xml
+++ b/man/machine-info.xml
@@ -9,16 +9,16 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -55,7 +55,7 @@
Description
The /etc/machine-info file
- contains machine meta data.
+ contains machine metadata.
The basic file format of
machine-info is a
@@ -68,18 +68,23 @@
execution engine.
/etc/machine-info contains
- meta data about the machine that is set by the user or
+ metadata about the machine that is set by the user or
administrator.
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.
Options
- The following machine meta data parameters may
+ The following machine metadata parameters may
be set using
/etc/machine-info:
@@ -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_NAME="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