From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 7 Mar 2018 09:14:41 +0000 (+0100)
Subject: Merge pull request #7817 from medhefgo/systemd-boot
X-Git-Tag: v239~576
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=595ced4d812e731835b2e97458e82aaf54001095

Merge pull request #7817 from medhefgo/systemd-boot

systemd-boot improvements
---

595ced4d812e731835b2e97458e82aaf54001095
diff --cc src/shared/bootspec.c
index 0e3e17a7763,8f3faeecb39..1c9ef400191
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@@ -193,15 -187,21 +195,19 @@@ int boot_loader_read_conf(const char *p
                          log_warning("%s:%u: Bad syntax", path, line);
                          continue;
                  }
 -                *p = '\0';
 -                p = strstrip(p + 1);
  
 -                if (streq(buf, "default"))
 +                if (streq(field, "default"))
                          r = free_and_strdup(&config->default_pattern, p);
 -                else if (streq(buf, "timeout"))
 +                else if (streq(field, "timeout"))
                          r = free_and_strdup(&config->timeout, p);
 -                else if (streq(buf, "editor"))
 +                else if (streq(field, "editor"))
                          r = free_and_strdup(&config->editor, p);
+                 else if (streq(buf, "auto-entries"))
+                         r = free_and_strdup(&config->auto_entries, p);
+                 else if (streq(buf, "auto-firmware"))
+                         r = free_and_strdup(&config->auto_firmware, p);
                  else {
 -                        log_notice("%s:%u: Unknown line \"%s\"", path, line, buf);
 +                        log_notice("%s:%u: Unknown line \"%s\"", path, line, field);
                          continue;
                  }
                  if (r < 0)