Merge pull request #7817 from medhefgo/systemd-boot

systemd-boot improvements

diff --cc src/shared/bootspec.c
index 0e3e17a77638a402905c52c00f72f592fdd7dd4c,8f3faeecb3972f105eaf06f41106a6cf2eaf66a6..1c9ef4001919d5ef11bc5c0571e5248813007989
--- 1/src/shared/bootspec.c
--- 2/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)