From 59512f21d77d984cf1363fb0d1770218c5e17020 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 29 Jul 2015 16:50:49 +0200 Subject: gpt-auto-generator: merge efi-boot-generator --- man/file-hierarchy.xml | 4 +- man/systemd-efi-boot-generator.xml | 85 -------------------------------------- man/systemd-gpt-auto-generator.xml | 15 ++++--- man/systemd.generator.xml | 1 - 4 files changed, 12 insertions(+), 93 deletions(-) delete mode 100644 man/systemd-efi-boot-generator.xml (limited to 'man') diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml index 3a5627d196..058998b51f 100644 --- a/man/file-hierarchy.xml +++ b/man/file-hierarchy.xml @@ -86,7 +86,7 @@ The boot partition used for bringing up the system. On EFI systems this is possibly the EFI System Partition, also see - systemd-efi-boot-generator8. + systemd-gpt-auto-generator8. This directory is usually strictly local to the host, and should be considered read-only, except when a new kernel or boot loader is installed. This directory only exists on @@ -804,7 +804,7 @@ systemd1, hier7, systemd-path1, - systemd-efi-boot-generator8, + systemd-gpt-auto-generator8, sysctl.d5, tmpfiles.d5, pkg-config1, diff --git a/man/systemd-efi-boot-generator.xml b/man/systemd-efi-boot-generator.xml deleted file mode 100644 index 23464bcf15..0000000000 --- a/man/systemd-efi-boot-generator.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - systemd-efi-boot-generator - systemd - - - - Developer - Lennart - Poettering - lennart@poettering.net - - - - - - systemd-efi-boot-generator - 8 - - - - systemd-efi-boot-generator - Generator for automatically mounting the - EFI System Partition used by the current boot to - /boot - - - - /usr/lib/systemd/system-generators/systemd-efi-boot-generator - - - - Description - - systemd-efi-boot-generator is a - generator that automatically creates mount and automount units for - the EFI System Partition (ESP), mounting it to - /boot. Note that this generator will execute - no operation on non-EFI systems, on systems where the boot loader - does not communicate the used ESP to the OS, on systems where - /boot is an explicitly configured mount (for - example, listed in - fstab5) - or where the /boot mount point is non-empty. - Since this generator creates an automount unit, the mount will - only be activated on-demand, when accessed. - - systemd-efi-boot-generator implements - systemd.generator7. - - - - See Also - - systemd1, - systemd.mount5, - systemd.automount5, - systemd-gpt-auto-generator8, - fstab5 - - - - 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 @@ /etc/crypttab with a different device mapper device name. - Also note that - systemd-efi-boot-generator8 - will mount the EFI System Partition (ESP) to - /boot if not otherwise mounted. + Mount and automount units for the EFI System Partition (ESP), + mounting it to /boot 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 + /boot is an explicitly configured mount + (for example, listed in + fstab5) + or where the /boot mount point is non-empty, no + mount units are generated. When using this generator in conjunction with btrfs file systems, make sure to set the correct default subvolumes on them, @@ -170,7 +176,6 @@ systemd.mount5, systemd.swap5, systemd-fstab-generator8, - systemd-efi-boot-generator8, systemd-cryptsetup@.service8, cryptsetup8, fstab5, diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml index 2285e91812..4514c1afdf 100644 --- a/man/systemd.generator.xml +++ b/man/systemd.generator.xml @@ -331,7 +331,6 @@ find $dir systemd1, systemd-cryptsetup-generator8, systemd-debug-generator8, - systemd-efi-boot-generator8, systemd-fstab-generator8, fstab5, systemd-getty-generator8, -- cgit v1.2.3-54-g00ecf