bootspec: load entries from both the ESP and XBOOTLDR partitions

Let's simply search in both.
2019-03-01 12:41:32 +01:00
parent 9fc32cd9b3
commit a2f8664e9a
4 changed files with 50 additions and 34 deletions
@@ -3531,7 +3531,7 @@ static int load_kexec_kernel(void) {
        if (access(KEXEC, X_OK) < 0)
                return log_error_errno(errno, KEXEC" is not available: %m");

-        r = find_default_boot_entry(NULL, &config, &e);
+        r = find_default_boot_entry(NULL, NULL, &config, &e);
        if (r == -ENOKEY) /* find_default_boot_entry() doesn't warn about this case */
                return log_error_errno(r, "Cannot find the ESP partition mount point.");
        if (r < 0)