Don't check if '-n' is a current boot entry so early.

We haven't made the list yet, so it'll always be wrong.

This should fix part of https://github.com/vathpela/efibootmgr/issues/18

Signed-off-by: Peter Jones <pjones@redhat.com>

diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c
index c1917b5..546b55c 100644 (file)
--- a/src/efibootmgr/efibootmgr.c
+++ b/src/efibootmgr/efibootmgr.c
@@ -1174,12 +1174,6 @@ parse_opts(int argc, char **argv)
                                        result);
                                exit(1);
                        }
-                       if (!is_current_boot_entry(result)) {
-                               fprintf(stderr,
-                                       "Boot entry %04lX does not exist\n",
-                                       result);
-                               exit(1);
-                       }
                        opts.bootnext = result;
                        break;
                }
@@ -1355,9 +1349,13 @@ main(int argc, char **argv)
        }
 
        if (opts.delete_bootnext) {
+               if (!is_current_boot_entry(opts.delete_bootnext))
+                       errx(17, "Boot entry %04X does not exist\n",
+                               opts.delete_bootnext);
+
                ret = efi_del_variable(EFI_GLOBAL_GUID, "BootNext");
                if (ret < 0)
-                       err(10, "Could not set BootNext");
+                       err(10, "Could not delete BootNext");
        }
 
        if (opts.delete_timeout) {