diff options
| author | Kay Sievers <kay@vrfy.org> | 2013-12-16 01:52:58 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2013-12-16 01:52:58 +0100 |
| commit | 60ffd0b4e8e1781c1326c3fe7ef19b721436d336 (patch) | |
| tree | aff14fb278237ee0ee2fb166f68f3dfea2d37545 | |
| parent | 66a9f2901ee275d3eb668fad324f928194d9fbe3 (diff) | |
do not show splash for automatically added entries
| -rw-r--r-- | src/efi/gummiboot.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/efi/gummiboot.c b/src/efi/gummiboot.c index 940b162..f7eaa89 100644 --- a/src/efi/gummiboot.c +++ b/src/efi/gummiboot.c @@ -1482,9 +1482,15 @@ static BOOLEAN config_entry_add_loader(Config *config, EFI_HANDLE *device, EFI_F entry->loader = StrDuplicate(loader); entry->file = StrDuplicate(file); StrLwr(entry->file); - entry->no_autoselect = TRUE; entry->key = key; config_add_entry(config, entry); + + /* do not boot right away into aut-detected entries */ + entry->no_autoselect = TRUE; + + /* do not show a splash; they do not need one, or they draw their own */ + entry->splash = StrDuplicate(L""); + return TRUE; } @@ -1767,8 +1773,13 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) { err = EFI_NOT_FOUND; /* splash from entry file */ - if (entry->splash) - err = graphics_splash(root_dir, entry->splash); + if (entry->splash) { + /* some entries disable the splash because they draw their own */ + if (entry->splash[0] == '\0') + err = EFI_SUCCESS; + else + err = graphics_splash(root_dir, entry->splash); + } /* splash from config file */ if (EFI_ERROR(err) && config.splash) |