Make -e 1 and -e 3 work again after the libefiboot shuffle.

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

diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c
index 8af1ed6..4a233a3 100644 (file)
--- a/src/efibootmgr/efibootmgr.c
+++ b/src/efibootmgr/efibootmgr.c
@@ -1120,7 +1120,13 @@ parse_opts(int argc, char **argv)
                        rc = sscanf(optarg, "%u", &num);
                        if (rc == 1) opts.edd_version = num;
                        else {
-                               fprintf (stderr,"invalid numeric value %s\n",optarg);
+                               fprintf (stderr,"invalid numeric value %s\n",
+                                        optarg);
+                               exit(1);
+                       }
+                       if (num != 0 && num != 1 && num != 3) {
+                               fprintf (stderr, "invalid EDD version %d\n",
+                                        num);
                                exit(1);
                        }
                        break;
@@ -1128,7 +1134,8 @@ parse_opts(int argc, char **argv)
                        rc = sscanf(optarg, "%x", &num);
                        if (rc == 1) opts.edd10_devicenum = num;
                        else {
-                               fprintf (stderr,"invalid hex value %s\n",optarg);
+                               fprintf (stderr,"invalid hex value %s\n",
+                                        optarg);
                                exit(1);
                        }
                        break;

diff --git a/src/include/efibootmgr.h b/src/include/efibootmgr.h
index 0d60bd1..f020626 100644 (file)
--- a/src/include/efibootmgr.h
+++ b/src/include/efibootmgr.h
@@ -35,7 +35,7 @@ typedef struct {
        char *extra_opts_file;
        uint32_t part;
        int edd_version;
-       int edd10_devicenum;
+       uint32_t edd10_devicenum;
        int bootnum;
        int bootnext;
        int verbose;

diff --git a/src/lib/efi.c b/src/lib/efi.c
index 470b0fd..8176bbc 100644 (file)
--- a/src/lib/efi.c
+++ b/src/lib/efi.c
@@ -262,6 +262,41 @@ err_needed:
 }
 #endif
 
+static int
+get_edd_version(void)
+{
+       efi_guid_t guid = BLKX_UNKNOWN_GUID;
+       uint8_t *data = NULL;
+       size_t data_size = 0;
+       uint32_t attributes;
+       efidp_header *path;
+       int rc = 0;
+
+       /* Allow global user option override */
+
+       switch (opts.edd_version)
+       {
+       case 0: /* No EDD information */
+               return 0;
+       case 1: /* EDD 1.0 */
+               return 1;
+       case 3: /* EDD 3.0 */
+               return 3;
+       default:
+               break;
+       }
+
+       rc = efi_get_variable(guid, "blk0", &data, &data_size, &attributes);
+       if (rc < 0)
+               return rc;
+
+       path = (efidp_header *)data;
+       if (path->type == 2 && path->subtype == 1)
+               return 3;
+       return 1;
+}
+
+
 /**
  * make_linux_load_option()
  * @data - load option returned
@@ -297,8 +332,26 @@ err:
                        goto err;
        } else {
 #endif
-               needed = efi_generate_file_device_path(NULL, 0, opts.loader,
-                                                      EFIBOOT_ABBREV_HD);
+               /* there's really no telling if this is even the right disk,
+                * but... I also never see blk0 exported to runtime on any
+                * hardware, so it probably only happens on some old itanium
+                * box from the beginning of time anyway. */
+               uint32_t options = EFIBOOT_ABBREV_HD;
+               int edd = get_edd_version();
+
+               switch (edd) {
+               case 1:
+                       options = EFIBOOT_ABBREV_EDD10;
+                       break;
+               case 3:
+                       options = EFIBOOT_ABBREV_NONE;
+                       break;
+               }
+
+               needed = efi_generate_file_device_path_from_esp(NULL, 0,
+                                               opts.disk, opts.part,
+                                               opts.loader, options,
+                                               opts.edd10_devicenum);
                if (needed < 0)
                        return -1;
 
@@ -306,10 +359,11 @@ err:
                        dp = malloc(needed);
                        if (dp == NULL)
                                return -1;
-                       needed = efi_generate_file_device_path((uint8_t *)dp,
-                                                              needed,
-                                                              opts.loader,
-                                                            EFIBOOT_ABBREV_HD);
+                       needed = efi_generate_file_device_path_from_esp(
+                                               (uint8_t *)dp, needed,
+                                               opts.disk, opts.part,
+                                               opts.loader, options,
+                                               opts.edd10_devicenum);
                        if (needed < 0) {
                                free(dp);
                                return -1;