aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2014-08-15 09:52:43 -0400
committerGerd Hoffmann <kraxel@redhat.com>2014-08-26 10:16:19 +0200
commitbe16c16ab3cc9319590a68239acb240c758dfffb (patch)
treef740da5702fd5f0fb9fe35e3c1ab9f99245af4ce
parent091f53e6cb8ee88577d1eb1be7285b9a42177e26 (diff)
downloadseabios-be16c16ab3cc9319590a68239acb240c758dfffb.zip
seabios-be16c16ab3cc9319590a68239acb240c758dfffb.tar.gz
seabios-be16c16ab3cc9319590a68239acb240c758dfffb.tar.bz2
boot: Change ":rom%d" boot order rom instance to ":rom%x"
Use hex numbers for the rom instance count in boot order open firmware device naming. The ":rom" suffix isn't part of a standard and it's highly unlikely any rom would have 10 or more drives on it, but this change makes the code more similar to the numbering of other boot order devices. Signed-off-by: Kevin O'Connor <kevin@koconnor.net> Reviewed-by: Markus Armbruster <armbru@redhat.com> (cherry picked from commit e710447ef1d2bd4e61e12b210039c00fbeacf624)
-rw-r--r--src/boot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/boot.c b/src/boot.c
index e60ed3e..97de89c 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -189,7 +189,7 @@ int bootprio_find_pci_rom(struct pci_device *pci, int instance)
char desc[256], *p;
p = build_pci_path(desc, sizeof(desc), "*", pci);
if (instance)
- snprintf(p, desc+sizeof(desc)-p, ":rom%d", instance);
+ snprintf(p, desc+sizeof(desc)-p, ":rom%x", instance);
return find_prio(desc);
}
@@ -201,7 +201,7 @@ int bootprio_find_named_rom(const char *name, int instance)
char desc[256], *p;
p = desc + snprintf(desc, sizeof(desc), "/rom@%s", name);
if (instance)
- snprintf(p, desc+sizeof(desc)-p, ":rom%d", instance);
+ snprintf(p, desc+sizeof(desc)-p, ":rom%x", instance);
return find_prio(desc);
}