diff --git a/man/loader.conf.xml b/man/loader.conf.xml index 9592f48247..c7794cd195 100644 --- a/man/loader.conf.xml +++ b/man/loader.conf.xml @@ -142,9 +142,12 @@ console-mode - This option configures the resolution of the console. Takes a - number or one of the special values listed below. The following values may be - used: + This option configures the resolution of the console. This may be changed in + the boot menu itself and will be stored as an EFI variable in that case, overriding this + option. + + Takes a number or one of the special values listed below. The following + values may be used: diff --git a/man/systemd-boot.xml b/man/systemd-boot.xml index def2d06cf1..b6efd8927c 100644 --- a/man/systemd-boot.xml +++ b/man/systemd-boot.xml @@ -416,6 +416,15 @@ + + LoaderConfigConsoleMode + The numerical menu console mode. Read by the boot loader. LoaderConfigConsoleMode + is maintained persistently. LoaderConfigConsoleMode may be manipulated with the + r/R keys, see above. + + + + LoaderDevicePartUUID @@ -452,6 +461,27 @@ + + LoaderEntryLastBooted + + The identifier of the boot loader entry last attempted. Set and read by the boot loader, + only when /loader/loader.conf has default set to @saved. See + loader.conf5. + + The boot loader will ensure LoaderEntryLastBooted is up-to date for every boot, + updating it as needed and will omit changing it all together when LoaderEntryOneShot + is set. + + The boot loader reads the variable, which takes higher priority than + LoaderEntryDefault. The variable is ignored when LoaderEntryOneShot + is set. + + LoaderEntryLastBooted cannot be used as indication that the last boot was + successful or not. + + + + LoaderEntrySelected diff --git a/src/boot/bootctl-install.c b/src/boot/bootctl-install.c index ca14564a8e..e6f66deeab 100644 --- a/src/boot/bootctl-install.c +++ b/src/boot/bootctl-install.c @@ -972,9 +972,11 @@ static int remove_loader_variables(void) { /* Remove all persistent loader variables we define */ FOREACH_STRING(var, + EFI_LOADER_VARIABLE(LoaderConfigConsoleMode), EFI_LOADER_VARIABLE(LoaderConfigTimeout), EFI_LOADER_VARIABLE(LoaderConfigTimeoutOneShot), EFI_LOADER_VARIABLE(LoaderEntryDefault), + EFI_LOADER_VARIABLE(LoaderEntryLastBooted), EFI_LOADER_VARIABLE(LoaderEntryOneShot), EFI_LOADER_VARIABLE(LoaderSystemToken)){