diff options
author | Lennart Poettering <lennart@poettering.net> | 2022-03-23 12:04:28 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2022-03-23 12:25:01 +0100 |
commit | 8f39ecf6aa5bdfd2498e147476eb4b8f25d817bc (patch) | |
tree | cf8468460620637b2b7a64df12b7863651ea2bab | |
parent | a43d2229bb3ba6b814d958c6f9d73b74f305ff82 (diff) | |
download | systemd-8f39ecf6aa5bdfd2498e147476eb4b8f25d817bc.tar.gz |
docs: link up new image building docs a bit
-rw-r--r-- | docs/DISCOVERABLE_PARTITIONS.md | 7 | ||||
-rw-r--r-- | man/machine-id.xml | 14 | ||||
-rw-r--r-- | man/systemd-random-seed.service.xml | 3 |
3 files changed, 13 insertions, 11 deletions
diff --git a/docs/DISCOVERABLE_PARTITIONS.md b/docs/DISCOVERABLE_PARTITIONS.md index 2d95ee4490..85e858921f 100644 --- a/docs/DISCOVERABLE_PARTITIONS.md +++ b/docs/DISCOVERABLE_PARTITIONS.md @@ -412,6 +412,7 @@ The `gdisk` tool (from version 1.0.5 onward) and its variants (`sgdisk`, [Boot Loader Specification](https://systemd.io/BOOT_LOADER_SPECIFICATION)<br> [Boot Loader Interface](https://systemd.io/BOOT_LOADER_INTERFACE)<br> -[systemd-boot(7)](https://www.freedesktop.org/software/systemd/man/systemd-boot.html)<br> -[bootctl(1)](https://www.freedesktop.org/software/systemd/man/bootctl.html)<br> -[systemd-gpt-auto-generator(8)](https://www.freedesktop.org/software/systemd/man/systemd-gpt-auto-generator.html) +[Safely Building Images](https://systemd.io/BUILDING_IMAGES)<br> +[`systemd-boot(7)`](https://www.freedesktop.org/software/systemd/man/systemd-boot.html)<br> +[`bootctl(1)`](https://www.freedesktop.org/software/systemd/man/bootctl.html)<br> +[`systemd-gpt-auto-generator(8)`](https://www.freedesktop.org/software/systemd/man/systemd-gpt-auto-generator.html) diff --git a/man/machine-id.xml b/man/machine-id.xml index d5d3a1a299..9bd49582fc 100644 --- a/man/machine-id.xml +++ b/man/machine-id.xml @@ -80,13 +80,13 @@ <filename>/etc/machine-id</filename> may also be written using any other means. </para> - <para>For operating system images which are created once and used on multiple - machines, for example for containers or in the cloud, - <filename>/etc/machine-id</filename> should be either missing or an empty file in the generic file - system image (the difference between the two options is described under "First Boot Semantics" below). An - ID will be generated during boot and saved to this file if possible. Having an empty file in place is - useful because it allows a temporary file to be bind-mounted over the real file, in case the image is - used read-only.</para> + <para>For operating system images which are created once and used on multiple machines, for example for + containers or in the cloud, <filename>/etc/machine-id</filename> should be either missing or an empty + file in the generic file system image (the difference between the two options is described under "First + Boot Semantics" below). An ID will be generated during boot and saved to this file if possible. Having an + empty file in place is useful because it allows a temporary file to be bind-mounted over the real file, + in case the image is used read-only. Also see <ulink url="https://systemd.io/BUILDING_IMAGES">Safely + Building Images</ulink>.</para> <para><citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry> may be used to initialize <filename>/etc/machine-id</filename> on mounted (but not diff --git a/man/systemd-random-seed.service.xml b/man/systemd-random-seed.service.xml index 3137ed0c81..0a50b51e4d 100644 --- a/man/systemd-random-seed.service.xml +++ b/man/systemd-random-seed.service.xml @@ -57,7 +57,8 @@ thus — if otherwise entropy-starved — generate the same or at least guessable random seed streams. As a safety precaution crediting entropy is thus disabled by default. It is recommended to remove the random seed from OS images intended for replication on multiple systems, in which case it is safe to enable - entropy crediting, see below.</para> + entropy crediting, see below. Also see <ulink url="https://systemd.io/BUILDING_IMAGES">Safely Building + Images</ulink>.</para> <para>See <ulink url="https://systemd.io/RANDOM_SEEDS">Random Seeds</ulink> for further information.</para> |