mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-03 01:17:45 +03:00
docs: improve wording when mentioning the acronym "ESP"
"ESP" is "EFI system partition", so "ESP partition" is redundant.
This commit is contained in:
parent
d0e18bb4b0
commit
250db1bf02
@ -76,10 +76,10 @@ variables. All EFI variables use the vendor UUID
|
|||||||
* `1 << 6` → The boot loader supports passing a random seed to the OS.
|
* `1 << 6` → The boot loader supports passing a random seed to the OS.
|
||||||
|
|
||||||
* The EFI variable `LoaderRandomSeed` contains a binary random seed if set. It
|
* The EFI variable `LoaderRandomSeed` contains a binary random seed if set. It
|
||||||
is set by the boot loader to pass an entropy seed read from the ESP partition
|
is set by the boot loader to pass an entropy seed read from the ESP to the OS.
|
||||||
to the OS. The system manager then credits this seed to the kernel's entropy
|
The system manager then credits this seed to the kernel's entropy pool. It is
|
||||||
pool. It is the responsibility of the boot loader to ensure the quality and
|
the responsibility of the boot loader to ensure the quality and integrity of
|
||||||
integrity of the random seed.
|
the random seed.
|
||||||
|
|
||||||
* The EFI variable `LoaderSystemToken` contains binary random data,
|
* The EFI variable `LoaderSystemToken` contains binary random data,
|
||||||
persistently set by the OS installer. Boot loaders that support passing
|
persistently set by the OS installer. Boot loaders that support passing
|
||||||
|
@ -61,8 +61,8 @@ Everything described below is located on a placeholder file system `$BOOT`. The
|
|||||||
* On disks with GPT (GUID Partition Table)
|
* On disks with GPT (GUID Partition Table)
|
||||||
* If the OS is installed on a disk with GPT, and an Extended Boot Loader Partition or XBOOTLDR partition for short, i.e. a partition with GPT type GUID of `bc13c2ff-59e6-4262-a352-b275fd6f7172`, already exists, it should be used as `$BOOT`.
|
* If the OS is installed on a disk with GPT, and an Extended Boot Loader Partition or XBOOTLDR partition for short, i.e. a partition with GPT type GUID of `bc13c2ff-59e6-4262-a352-b275fd6f7172`, already exists, it should be used as `$BOOT`.
|
||||||
* Otherwise, if the OS is installed on a disk with GPT, and an EFI System Partition or ESP for short, i.e. a partition with GPT type UID of `c12a7328-f81f-11d2-ba4b-00a0c93ec93b`) already exists and is large enough (let's say 250MB) and otherwise qualifies, it should be used as `$BOOT`.
|
* Otherwise, if the OS is installed on a disk with GPT, and an EFI System Partition or ESP for short, i.e. a partition with GPT type UID of `c12a7328-f81f-11d2-ba4b-00a0c93ec93b`) already exists and is large enough (let's say 250MB) and otherwise qualifies, it should be used as `$BOOT`.
|
||||||
* Otherwise, if the OS is installed on a disk with GPT, and if the ESP partition already exists but is too small, a new suitably sized (let's say 500MB) XBOOTLDR partition shall be created and used as `$BOOT`.
|
* Otherwise, if the OS is installed on a disk with GPT, and if the ESP already exists but is too small, a new suitably sized (let's say 500MB) XBOOTLDR partition shall be created and used as `$BOOT`.
|
||||||
* Otherwise, if the OS is installed on a disk with GPT, and no ESP partition exists yet, a new suitably sized (let's say 500MB) ESP should be created and used as `$BOOT`.
|
* Otherwise, if the OS is installed on a disk with GPT, and no ESP exists yet, a new suitably sized (let's say 500MB) ESP should be created and used as `$BOOT`.
|
||||||
|
|
||||||
This placeholder file system shall be determined during _installation time_, and an fstab entry may be created. It should be mounted to either `/boot/` or `/efi/`. Additional locations like `/boot/efi/`, with `/boot/` being a separate file system, might be supported by implementations. This is not recommended because the mounting of `$BOOT` is then dependent on and requires the mounting of the intermediate file system.
|
This placeholder file system shall be determined during _installation time_, and an fstab entry may be created. It should be mounted to either `/boot/` or `/efi/`. Additional locations like `/boot/efi/`, with `/boot/` being a separate file system, might be supported by implementations. This is not recommended because the mounting of `$BOOT` is then dependent on and requires the mounting of the intermediate file system.
|
||||||
|
|
||||||
|
@ -73,8 +73,8 @@
|
|||||||
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> for
|
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> for
|
||||||
details.</para></listitem>
|
details.</para></listitem>
|
||||||
|
|
||||||
<listitem><para>An EFI variable set by the boot loader informs the OS about the ESP partition used
|
<listitem><para>An EFI variable set by the boot loader informs the OS about the EFI System Partition used
|
||||||
during boot. This is then used to automatically mount the correct ESP partition to
|
during boot. This is then used to automatically mount the correct EFI System Partition to
|
||||||
<filename>/efi/</filename> or <filename>/boot/</filename> during OS runtime. See
|
<filename>/efi/</filename> or <filename>/boot/</filename> during OS runtime. See
|
||||||
<citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
<citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
||||||
for details.</para></listitem>
|
for details.</para></listitem>
|
||||||
|
@ -1337,7 +1337,7 @@ static int verb_status(int argc, char *argv[], void *userdata) {
|
|||||||
sd_id128_t bootloader_esp_uuid;
|
sd_id128_t bootloader_esp_uuid;
|
||||||
bool have_bootloader_esp_uuid = efi_loader_get_device_part_uuid(&bootloader_esp_uuid) >= 0;
|
bool have_bootloader_esp_uuid = efi_loader_get_device_part_uuid(&bootloader_esp_uuid) >= 0;
|
||||||
|
|
||||||
print_yes_no_line(false, have_bootloader_esp_uuid, "Boot loader sets ESP partition information");
|
print_yes_no_line(false, have_bootloader_esp_uuid, "Boot loader sets ESP information");
|
||||||
if (have_bootloader_esp_uuid && !sd_id128_equal(esp_uuid, bootloader_esp_uuid))
|
if (have_bootloader_esp_uuid && !sd_id128_equal(esp_uuid, bootloader_esp_uuid))
|
||||||
printf("WARNING: The boot loader reports a different ESP UUID than detected!\n");
|
printf("WARNING: The boot loader reports a different ESP UUID than detected!\n");
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ static int load_kexec_kernel(void) {
|
|||||||
return log_error_errno(r,
|
return log_error_errno(r,
|
||||||
"No kexec kernel loaded and autodetection failed.\n%s",
|
"No kexec kernel loaded and autodetection failed.\n%s",
|
||||||
is_efi_boot()
|
is_efi_boot()
|
||||||
? "Cannot automatically load kernel: ESP partition mount point not found."
|
? "Cannot automatically load kernel: ESP mount point not found."
|
||||||
: "Automatic loading works only on systems booted with EFI.");
|
: "Automatic loading works only on systems booted with EFI.");
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return r;
|
return r;
|
||||||
|
Loading…
Reference in New Issue
Block a user