mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-30 13:53:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

sd-boot: Allow automatic entries to be default

Browse Source
This commit is contained in:
Jan Janssen 2021-08-14 13:06:37 +02:00
parent 730b719406
commit 64bb56e58b
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
man/loader.conf.xml
View File

@ -58,7 +58,44 @@
<listitem><para>A glob pattern to select the default entry. The default entry <listitem><para>A glob pattern to select the default entry. The default entry
may be changed in the boot menu itself, in which case the name of the may be changed in the boot menu itself, in which case the name of the
selected entry will be stored as an EFI variable, overriding this option. selected entry will be stored as an EFI variable, overriding this option.
</para></listitem> </para>
<table>
<title>Automatically detected entries will use the following names:</title>
<tgroup cols='2'>
<colspec colname='name' />
<colspec colname='expl' />
<thead>
<row>
<entry>Name</entry>
<entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry>auto-efi-default</entry>
<entry>EFI Default Loader</entry>
</row>
<row>
<entry>auto-efi-shell</entry>
<entry>EFI Shell</entry>
</row>
<row>
<entry>auto-osx</entry>
<entry>macOS</entry>
</row>
<row>
<entry>auto-reboot-to-firmware-setup</entry>
<entry>Reboot Into Firmware Interface</entry>
</row>
<row>
<entry>auto-windows</entry>
<entry>Windows Boot Manager</entry>
</row>
</tbody>
</tgroup>
</table></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

5
src/boot/efi/boot.c
View File

@ -1590,8 +1590,7 @@ static VOID config_default_entry_select(Config *config) {
/* /*
* The EFI variable to select the default boot entry overrides the * The EFI variable to select the default boot entry overrides the
* configured pattern. The variable can be set and cleared by pressing * configured pattern. The variable can be set and cleared by pressing
* the 'd' key in the loader selection menu, the entry is marked with * the 'd' key in the loader selection menu.
* an '*'.
*/ */
err = efivar_get(LOADER_GUID, L"LoaderEntryDefault", &entry_default); err = efivar_get(LOADER_GUID, L"LoaderEntryDefault", &entry_default);
if (!EFI_ERROR(err)) { if (!EFI_ERROR(err)) {
@ -1615,8 +1614,6 @@ static VOID config_default_entry_select(Config *config) {
if (config->entry_default_pattern) { if (config->entry_default_pattern) {
i = config->entry_count; i = config->entry_count;
while (i--) { while (i--) {
if (config->entries[i]->no_autoselect)
continue;
if (MetaiMatch(config->entries[i]->id, config->entry_default_pattern)) { if (MetaiMatch(config->entries[i]->id, config->entry_default_pattern)) {
config->idx_default = i; config->idx_default = i;
return; return;