X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-machine-id-setup.xml;h=28352e357f9faa987a358e61a6831def0429742e;hb=6dfcc64bb5c67ec2e026715146c19acf93dab31a;hp=49b92f689135ca438ab93da4adc25015c309d934;hpb=19c5f19d69bb5f520fa7213239490c55de06d99d;p=elogind.git
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index 49b92f689..28352e357 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -8,20 +8,21 @@
Copyright 2012 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 .
-->
-
+systemd-machine-id-setup
@@ -44,7 +45,7 @@
systemd-machine-id-setup
- Initialize the machine ID in /etc/machine-id
+ Initialize the machine ID in /etc/machine-id
@@ -69,12 +70,12 @@
initialized.
If a valid D-Bus machine ID is already
- configured for the system the D-Bus machine ID is
+ configured for the system, the D-Bus machine ID is
copied and used to initialize the machine ID in
/etc/machine-id.If run inside a KVM virtual machine and a UUID
- is passed via the option this
+ is passed via the option, this
UUID is used to initialize the machine ID instead of a
randomly generated one. The caller must ensure that the
UUID passed is sufficiently unique and is different
@@ -87,18 +88,38 @@
url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container
Interface.
+ Use
+ systemd-firstboot1
+ to initialize the machine ID on mounted (but not
+ booted) system images.
+
Options
- This tool does not take any options or arguments.
+ The following options are understood:
+
+
+
+
+ Takes a directory path
+ as an argument. All paths will be
+ prefixed with the given alternate
+ root path,
+ including config search paths.
+
+
+
+
+
+
Exit status
- On success 0 is returned, a non-zero failure
+ On success, 0 is returned, a non-zero failure
code otherwise.
@@ -107,7 +128,8 @@
systemd1,
machine-id5,
- dbus-uuidgen1
+ dbus-uuidgen1,
+ systemd-firstboot1