chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ea1851b
)
boot: efi - ignore .conf snippets starting with "auto-"
author
Kay Sievers
<kay@vrfy.org>
Sat, 28 Feb 2015 11:21:25 +0000
(12:21 +0100)
committer
Kay Sievers
<kay@vrfy.org>
Sun, 1 Mar 2015 12:16:10 +0000
(13:16 +0100)
src/boot/efi/boot.c
patch
|
blob
|
history
diff --git
a/src/boot/efi/boot.c
b/src/boot/efi/boot.c
index 1f2b6a7d6d16eb64ba072a6f5988a98aea0afa93..3f8140ebff0d30477258d2a997a68e33346a515d 100644
(file)
--- a/
src/boot/efi/boot.c
+++ b/
src/boot/efi/boot.c
@@
-1171,11
+1171,14
@@
static VOID config_load(Config *config, EFI_HANDLE *device, EFI_FILE *root_dir,
continue;
if (f->Attribute & EFI_FILE_DIRECTORY)
continue;
continue;
if (f->Attribute & EFI_FILE_DIRECTORY)
continue;
+
len = StrLen(f->FileName);
if (len < 6)
continue;
if (StriCmp(f->FileName + len - 5, L".conf") != 0)
continue;
len = StrLen(f->FileName);
if (len < 6)
continue;
if (StriCmp(f->FileName + len - 5, L".conf") != 0)
continue;
+ if (StrnCmp(f->FileName, L"auto-", 5) == 0)
+ continue;
len = file_read(entries_dir, f->FileName, 0, 0, &content);
if (len > 0)
len = file_read(entries_dir, f->FileName, 0, 0, &content);
if (len > 0)