From ee48dbd55f544d9ee4a17497b5757be7e854c869 Mon Sep 17 00:00:00 2001
From: Nils Carlson <pyssling@ludd.ltu.se>
Date: Mon, 6 Jul 2015 00:00:59 +0200
Subject: core: Add machine-id setting

Allow for overriding all other machine-ids which may be present on
the system using a kernel command line systemd.machine_id or
--machine-id= option.

This is especially useful for network booted systems where the
machine-id needs to be static, or for containers where a specific
machine-id is wanted.
---
 man/machine-id.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'man/machine-id.xml')

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>
-- 
cgit v1.2.3-54-g00ecf