poma
2016-Jul-17 19:23 UTC
[syslinux] [PATCH] Restore - chain.c32: Allow both "guid" and "uuid"
The GPT specification calls it "guid", but the Unix world generally calls it "uuid". Ref. http://git.zytor.com/syslinux/syslinux.git/commit/?id=3905382 This restores "uuid" as a synonym for GPT "guid" --- com32/chain/chain.c | 3 ++- com32/chain/options.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/com32/chain/chain.c b/com32/chain/chain.c index 4e9e32d..492f21c 100644 --- a/com32/chain/chain.c +++ b/com32/chain/chain.c @@ -286,7 +286,8 @@ int find_dp(struct part_iter **_iter) error("Unable to find requested MBR signature."); goto bail; } - } else if (!strncmp(opt.drivename, "guid", 4)) { + } else if (!strncmp(opt.drivename, "guid", 4) || + !strncmp(opt.drivename, "uuid", 4)) { if (str_to_guid(opt.drivename + 5, &gpt_guid)) goto bail; if (find_by_guid(&gpt_guid, &iter) < 0) { diff --git a/com32/chain/options.c b/com32/chain/options.c index e9c4a62..5531556 100644 --- a/com32/chain/options.c +++ b/com32/chain/options.c @@ -394,6 +394,8 @@ int opt_parse_args(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") -- 2.4.11