diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-07-29 18:45:48 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-07-29 18:45:48 +0200 |
| commit | c4a6d5085a8beadb2ea85fbf202b7674bd50bfb3 (patch) | |
| tree | f26e479a1ef9b7d14c398c06fd98205baad8dbe5 /man/systemd-gpt-auto-generator.xml | |
| parent | 2b32ffa07dfb62385f82d073c9c2fff890ac1889 (diff) | |
| parent | 59512f21d77d984cf1363fb0d1770218c5e17020 (diff) | |
Merge pull request #777 from kaysievers/gtp-auto
gpt-auto-generator: merge efi-boot-generator
Diffstat (limited to 'man/systemd-gpt-auto-generator.xml')
| -rw-r--r-- | man/systemd-gpt-auto-generator.xml | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml index 710c2e065e..27ec72c986 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -150,10 +150,16 @@ <filename>/etc/crypttab</filename> with a different device mapper device name.</para> - <para>Also note that - <citerefentry><refentrytitle>systemd-efi-boot-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry> - will mount the EFI System Partition (ESP) to - <filename>/boot</filename> if not otherwise mounted.</para> + <para>Mount and automount units for the EFI System Partition (ESP), + mounting it to <filename>/boot</filename> are generated on EFI + systems, where the boot loader communicates the used ESP to the operating + system. Since this generator creates an automount unit, the mount will + only be activated on-demand, when accessed. On systems where + <filename>/boot</filename> is an explicitly configured mount + (for example, listed in + <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>) + or where the <filename>/boot</filename> mount point is non-empty, no + mount units are generated.</para> <para>When using this generator in conjunction with btrfs file systems, make sure to set the correct default subvolumes on them, @@ -170,7 +176,6 @@ <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.swap</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>, - <citerefentry><refentrytitle>systemd-efi-boot-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-cryptsetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>, |