Received: from list by lists.gnu.org with archive (Exim 4.71) id 1hQB4H-0008Ql-LY for mharc-grub-devel@gnu.org; Mon, 13 May 2019 09:32:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQB4F-0008QO-HC for grub-devel@gnu.org; Mon, 13 May 2019 09:32:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQB4E-0006QP-E1 for grub-devel@gnu.org; Mon, 13 May 2019 09:32:35 -0400 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]:35259) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hQB4E-0006Px-6V for grub-devel@gnu.org; Mon, 13 May 2019 09:32:34 -0400 Received: by mail-lf1-x144.google.com with SMTP id c17so1747325lfi.2 for ; Mon, 13 May 2019 06:32:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=urdRPf3rMvuiPOODTwgAag1HBJm5nxzJKcub+9k0WxY=; b=sN0FVr96Iw0VCj1lGsExmiWzN5ei3PGbKMevSLNsmCrMdEQI/dZMXasnC0frcXMQ3O ujSki08N04WAex0NkUkNg3BeSULe0EKPfZmJDv1STHhcgJvn0ZxWPXRKyWHXkVykvnqu NXwtV8zKASzfhYw/mWn0LId5UP/70Cw0WEN5vDOtIOBQFkvMlBYSTkvcLlgoEqABsBAd pwUVAz0RzZjeYExDgzJZIaI6zweGCiYml57ESSLYzVX7+IuBZjGNwcUc3kzUajAMZvxD CoGH6sOjjvQLVeynIv0oOZX4fQcWwYVHZcA6dl/xRoqXQIXQLLkJnB5HzbcFhSKTNlVW arxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=urdRPf3rMvuiPOODTwgAag1HBJm5nxzJKcub+9k0WxY=; b=TVpnP/wyB8L1kUoCp34+sKK+kZgAql3eZ60ClBGO5aeUzTZAbaVovNcHUCP10koDEe a7qI+e9tYDDlwtNrqU/thgVdFGetkne1L/KRLALJ0KvF/gX8Co50lImYyDR3DY35MCXJ 5qMv3GdreSRgUUphJDI5xL/Qi8oeQJ/xuBszYrthy9NeSkxR359QPXqaS0EMhkkmSjJj yjl2dQIaRHjJJIWU1fM4pYoVbnAIy3/F6Q7qhx35J1L9bwdzIR/WsaTPZkXXqYrSOWha 7B70cagH1EyHVm3oEaRz/aJ6spvvc98MA7Xi46t983zp4aY5p8b5krlhWhP3hfK/kYWx yUuw== X-Gm-Message-State: APjAAAXLvN/v0r2FWNzUekG2qnSJoP8fKZFs+UYzhYZCd5BVfwyqaGcC wrjVLnFSviadyMb0VFNftr/bIEtc X-Google-Smtp-Source: APXvYqzn47WmmJGVNhZJ1djESDIeFx6cJtpdjecXBjyv/Jnxo6ZtbdqhRYeUl3BA5GlqxptQo2QNhg== X-Received: by 2002:ac2:51a9:: with SMTP id f9mr14220267lfk.56.1557754352347; Mon, 13 May 2019 06:32:32 -0700 (PDT) Received: from localhost.localdomain ([213.185.29.22]) by smtp.gmail.com with ESMTPSA id k18sm2258376ljk.70.2019.05.13.06.32.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 May 2019 06:32:31 -0700 (PDT) From: Jacob Kroon To: grub-devel@gnu.org Subject: [PATCH v5] probe: Support probing for GPT partition UUID with -g Date: Mon, 13 May 2019 15:32:22 +0200 Message-Id: <20190513133222.2373-1-jacob.kroon@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::144 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2019 13:32:36 -0000 Linux supports root=PARTUUID= boot argument, so add support for probing it. Compared to the fs UUID, the partition UUID does not change when reformatting a partition. Signed-off-by: Jacob Kroon --- docs/grub.texi | 2 +- grub-core/commands/probe.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) Changes since v4: * Do endianess byte-swapping on the fly when formatting string diff --git a/docs/grub.texi b/docs/grub.texi index 308b25074..d85818744 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -4771,7 +4771,7 @@ a rest. @node probe @subsection probe -@deffn Command probe [@option{--set} var] @option{--driver}|@option{--partmap}|@option{--fs}|@option{--fs-uuid}|@option{--label} device +@deffn Command probe [@option{--set} var] @option{--driver}|@option{--partmap}|@option{--fs}|@option{--fs-uuid}|@option{--label}|@option{--part-uuid} device Retrieve device information. If option @option{--set} is given, assign result to variable @var{var}, otherwise print information on the screen. @end deffn diff --git a/grub-core/commands/probe.c b/grub-core/commands/probe.c index 95d272287..b26cbe2cc 100644 --- a/grub-core/commands/probe.c +++ b/grub-core/commands/probe.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -45,6 +46,7 @@ static const struct grub_arg_option options[] = {"fs", 'f', 0, N_("Determine filesystem type."), 0, 0}, {"fs-uuid", 'u', 0, N_("Determine filesystem UUID."), 0, 0}, {"label", 'l', 0, N_("Determine filesystem label."), 0, 0}, + {"part-uuid", 'g', 0, N_("Determine GPT partition UUID."), 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -98,6 +100,38 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args) grub_device_close (dev); return GRUB_ERR_NONE; } + if (state[6].set) + { + /* AAAABBBB-CCCC-DDDD-EEEE-FFFFFFFFFFFF + null terminator */ + char val[37] = "none"; + if (dev->disk && dev->disk->partition && + grub_strcmp(dev->disk->partition->partmap->name, "gpt") == 0) + { + struct grub_gpt_partentry entry; + struct grub_partition *p = dev->disk->partition; + grub_disk_t disk = grub_disk_open(dev->disk->name); + if (!disk) + return grub_errno; + if (grub_disk_read(disk, p->offset, p->index, sizeof(entry), &entry)) + return grub_errno; + grub_disk_close(disk); + grub_gpt_part_guid_t *guid = &entry.guid; + grub_snprintf (val, sizeof(val), + "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + grub_le_to_cpu32 (guid->data1), + grub_le_to_cpu16 (guid->data2), + grub_le_to_cpu16 (guid->data3), + guid->data4[0], guid->data4[1], guid->data4[2], + guid->data4[3], guid->data4[4], guid->data4[5], + guid->data4[6], guid->data4[7]); + } + if (state[0].set) + grub_env_set (state[0].arg, val); + else + grub_printf ("%s", val); + grub_device_close (dev); + return GRUB_ERR_NONE; + } fs = grub_fs_probe (dev); if (! fs) return grub_errno; -- 2.20.1