Received: from list by lists.gnu.org with archive (Exim 4.71) id 1hOGQq-00029X-Af for mharc-grub-devel@gnu.org; Wed, 08 May 2019 02:52:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOGQn-000296-CZ for grub-devel@gnu.org; Wed, 08 May 2019 02:51:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOGQm-0001LY-El for grub-devel@gnu.org; Wed, 08 May 2019 02:51:57 -0400 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]:39666) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOGQm-0001Ky-83 for grub-devel@gnu.org; Wed, 08 May 2019 02:51:56 -0400 Received: by mail-lj1-x244.google.com with SMTP id q10so16489261ljc.6 for ; Tue, 07 May 2019 23:51:55 -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=7B1LqGzY7CsbJzP1/rU3J1lmQ4cOQLBmsEphE8Znrzk=; b=h+SKgEHqBv/7nP2RGrjVZClx7EOLvIsNpO8GBxc/cjQenh0eDHeo3G556JnMpRDqBG 8c9CgAHjP+YZ2v8gIjmVixmdbjpulfUCAM0MzJCBY8QQ7BcHIVrNgqyH2yqXKfv5QXt1 sHQyNGvcP6gPM3FgNgiOUw6jikxnkqNDQnaP0+srhd+CyNlbdtUGtBpTpuVHvfIavHyW /BTualM7ka6YOXiQkTNqyg2Kuz/ki02lRlPKE4R7wl0zwf6qDvu+m8Rt9+rswcdbMX4/ pCHr4rHPHsPd6PAgW/lkPtjrfy+L3PL8nYe3QKoah79JGQBRMoSlKUBV4X9m5PvIGwWs tNEw== 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=7B1LqGzY7CsbJzP1/rU3J1lmQ4cOQLBmsEphE8Znrzk=; b=CgX0ObkMUr5kVLU+VG0AaxIK1h5SeKdxYxHTfjoaP9kJfJjUmUYCHEtJ23AS7gixuI rTwL+bHvqHSw0p7xlNArfPALCQBVeW1qWEExvTAhvrw5fwZ1CfSKkyfRU80TEZXuErL0 h4hw5ttD739JpcW947Qb+nn34Ved8Klr52UCP1VEG0w7iEH3hN6XiAFTl2YIJUdEipfl VikQb0HiolgfHRXVgLtiwgU4oosLFg5z17Kuwm0f8G001CMRHSvl22DhnxbR0oKa0h8a EVHHSSnTimkC/ewR2/epRTsO1eMKjdLqs5A6qhgE8dS6+FQ4GCbsk5mXJ8/eZzLn/bCo hoEA== X-Gm-Message-State: APjAAAXXm2uQS8HH8D5DNzQ55S/154IovSXcQNGEquOOvom24kIc1lWJ VoIk0vGV2glMG3+rPjyd1qFtG8bd X-Google-Smtp-Source: APXvYqzSFU0kM49nyI7ERp7ciFuS/OkFqz3EhiLGYTryqmp+0V/HKCMSH/CFCpfoECk3DfyYe9taNw== X-Received: by 2002:a2e:1445:: with SMTP id 5mr254280lju.37.1557298313777; Tue, 07 May 2019 23:51:53 -0700 (PDT) Received: from localhost.localdomain ([213.185.29.22]) by smtp.gmail.com with ESMTPSA id w19sm3787462lfe.23.2019.05.07.23.51.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 May 2019 23:51:52 -0700 (PDT) From: Jacob Kroon To: grub-devel@gnu.org Subject: [PATCH v2] probe: Support probing for GPT partition uuid with -q Date: Wed, 8 May 2019 08:51:40 +0200 Message-Id: <20190508065140.27635-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::244 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: Wed, 08 May 2019 06:51:58 -0000 Signed-off-by: Jacob Kroon --- grub-core/commands/probe.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) Changes since v1: Read partuuid directly from disk on demand diff --git a/grub-core/commands/probe.c b/grub-core/commands/probe.c index 95d272287..14214dbaf 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}, + {"partuuid", 'q', 0, N_("Determine GPT partition uuid."), 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -98,6 +100,36 @@ 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", + guid->data1, guid->data2, 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