[syslinux:master] chain.c32: Allow both "guid" and "uuid"

syslinux-bot for H. Peter Anvin hpa at zytor.com
Sun Mar 13 22:21:15 PDT 2011


Commit-ID:  3905382158cc8c5c40f71e1b33f1802341838bca
Gitweb:     http://syslinux.zytor.com/commit/3905382158cc8c5c40f71e1b33f1802341838bca
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Sun, 13 Mar 2011 22:17:27 -0700
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Sun, 13 Mar 2011 22:17:27 -0700

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 at zytor.com>


---
 com32/modules/chain.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/com32/modules/chain.c b/com32/modules/chain.c
index 7071094..48f53ff 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);



More information about the Syslinux-commits mailing list