summaryrefslogtreecommitdiff
path: root/com32
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2011-03-13 22:17:27 -0700
committerH. Peter Anvin <hpa@zytor.com>2011-03-13 22:17:27 -0700
commit3905382158cc8c5c40f71e1b33f1802341838bca (patch)
tree001856108d4cdf2aa806d7934230d06b091b50f1 /com32
parentcf4679d793b1fa74ba9ad25d1bdd869dd805f712 (diff)
downloadsyslinux-3905382158cc8c5c40f71e1b33f1802341838bca.tar.gz
chain.c32: Allow both "guid" and "uuid"
The GPT specification calls it "guid", but the Unix world generally calls it "uuid". Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32')
-rw-r--r--com32/modules/chain.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/com32/modules/chain.c b/com32/modules/chain.c
index 70710945..48f53ffd 100644
--- a/com32/modules/chain.c
+++ b/com32/modules/chain.c
@@ -1387,6 +1387,8 @@ int main(int argc, char *argv[])
|| !strncmp(argv[i], "mbr=", 4)
|| !strncmp(argv[i], "guid:", 5)
|| !strncmp(argv[i], "guid=", 5)
+ || !strncmp(argv[i], "uuid:", 5)
+ || !strncmp(argv[i], "uuid=", 5)
|| !strncmp(argv[i], "label:", 6)
|| !strncmp(argv[i], "label=", 6)
|| !strcmp(argv[i], "boot")
@@ -1425,7 +1427,8 @@ int main(int argc, char *argv[])
error("Unable to find requested MBR signature\n");
goto bail;
}
- } else if (!strncmp(drivename, "guid", 4)) {
+ } else if (!strncmp(drivename, "guid", 4) ||
+ !strncmp(drivename, "uuid", 4)) {
if (str_to_guid(drivename + 5, &gpt_guid))
goto bail;
drive = find_by_guid(&gpt_guid, &cur_part);