From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 19 Jul 2019 16:28:16 +0000 (+0200)
Subject: bootctl: shortcut configuration file parsing
X-Git-Tag: v243-rc1~32^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c122dfef81de8a910f3fc526c0bed719314b27b;p=thirdparty%2Fsystemd.git

bootctl: shortcut configuration file parsing
---

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index e0f75562c08..2a8035f0b2e 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -1038,7 +1038,9 @@ static VOID config_defaults_load_from_file(Config *config, CHAR8 *content) {
 
                         if (EFI_ERROR(parse_boolean(value, &on)))
                                 continue;
+
                         config->editor = on;
+                        continue;
                 }
 
                 if (strcmpa((CHAR8 *)"auto-entries", key) == 0) {
@@ -1046,7 +1048,9 @@ static VOID config_defaults_load_from_file(Config *config, CHAR8 *content) {
 
                         if (EFI_ERROR(parse_boolean(value, &on)))
                                 continue;
+
                         config->auto_entries = on;
+                        continue;
                 }
 
                 if (strcmpa((CHAR8 *)"auto-firmware", key) == 0) {
@@ -1054,7 +1058,9 @@ static VOID config_defaults_load_from_file(Config *config, CHAR8 *content) {
 
                         if (EFI_ERROR(parse_boolean(value, &on)))
                                 continue;
+
                         config->auto_firmware = on;
+                        continue;
                 }
 
                 if (strcmpa((CHAR8 *)"console-mode", key) == 0) {