summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-01-12 23:30:20 +0100
committerLennart Poettering <lennart@poettering.net>2016-01-12 23:30:20 +0100
commitd9a090b9957b04ec34a145a0a40f41abafe73917 (patch)
tree7441efface736722b60d637133d0e7b6fc80541d /man
parent7e48712407aaee1f5624c0cb2cc16d633cc314d9 (diff)
parentee48dbd55f544d9ee4a17497b5757be7e854c869 (diff)
Merge pull request #490 from pyssling/master
Add machine-id setting
Diffstat (limited to 'man')
-rw-r--r--man/kernel-command-line.xml1
-rw-r--r--man/machine-id.xml6
-rw-r--r--man/systemd.xml17
3 files changed, 24 insertions, 0 deletions
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 309220632e..42d5e006bb 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -91,6 +91,7 @@
<term><varname>systemd.default_standard_output=</varname></term>
<term><varname>systemd.default_standard_error=</varname></term>
<term><varname>systemd.setenv=</varname></term>
+ <term><varname>systemd.machine_id=</varname></term>
<listitem>
<para>Parameters understood by the system and service
manager to control system behavior. For details, see
diff --git a/man/machine-id.xml b/man/machine-id.xml
index db72c2a01c..d318ec54ec 100644
--- a/man/machine-id.xml
+++ b/man/machine-id.xml
@@ -84,6 +84,12 @@
at install time. Use
<citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
to initialize it on mounted (but not booted) system images.</para>
+
+ <para>The machine-id may also be set, for example when network
+ booting, by setting the <varname>systemd.machine_id=</varname>
+ kernel command line parameter or passing the option
+ <option>--machine-id=</option> to systemd. A machine-id may not
+ be set to all zeros.</para>
</refsect1>
<refsect1>
diff --git a/man/systemd.xml b/man/systemd.xml
index 6de18f8294..367972099b 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -255,6 +255,14 @@
<option>inherit</option>.</para></listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--machine-id=</option></term>
+
+ <listitem><para>Override the machine-id set on the hard drive,
+ userful for network booting or for containers. May not be set
+ to all zeros.</para></listitem>
+ </varlistentry>
+
<xi:include href="standard-options.xml" xpointer="help" />
<xi:include href="standard-options.xml" xpointer="version" />
</variablelist>
@@ -977,6 +985,15 @@
</varlistentry>
<varlistentry>
+ <term><varname>systemd.machine_id=</varname></term>
+
+ <listitem><para>Takes a 32 character hex value to be
+ used for setting the machine-id. Intended mostly for
+ network booting where the same machine-id is desired
+ for every boot.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><varname>quiet</varname></term>
<listitem><para>Turn off status output at boot, much like