Received: from list by lists.gnu.org with archive (Exim 4.71) id 1hP4HC-0003Rr-P3 for mharc-grub-devel@gnu.org; Fri, 10 May 2019 08:05:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP4HA-0003RL-9O for grub-devel@gnu.org; Fri, 10 May 2019 08:05:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hP4H9-0007B2-8J for grub-devel@gnu.org; Fri, 10 May 2019 08:05:20 -0400 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]:43165) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hP4H9-0007AO-0W for grub-devel@gnu.org; Fri, 10 May 2019 08:05:19 -0400 Received: by mail-lf1-x141.google.com with SMTP id u27so3945216lfg.10 for ; Fri, 10 May 2019 05:05:18 -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=vIyzSO9ViCrAYAjBgV2Qam9ajhXjNOKgs8Quf1cWcK0=; b=Hiksg/rVj5cXntQwFtprfPhawQRr98PPLb2CaEW6XFPVTkbzMTdameK2jBnMrTYVNJ i5MVNjNJg/9rGjz8hNAnxPwxQHzKbhARWgEqFtYAeseF5xzvUyRhlFk0uITHrOVeWPOp XxwJPZGwoMXXuixh7xJVzyT1gO0c1fCFOAb98FGlaRcmLDijn26uDZIrbOdEYVmpJbjP GJdRpmY9/1LHwLLVJ82DTXY6mSLuxd/MZNeUAf2TjQwFJ+TbAbqO0uvvXYJoRlOeQETc L/TNqRcEaua7/xuM4mobt3wFKRqnPYgEV5fNMt4UDQxzj2iwq5X2K7loKFmpp6wk6GQQ uo7g== 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=vIyzSO9ViCrAYAjBgV2Qam9ajhXjNOKgs8Quf1cWcK0=; b=aXbXa8AiOLEQDZN8+J6x9vmEpfth86b56BFTMtotBD1LzbxZdkH0lXgCzCZej15OFP vkJ2orX3Fs9GkkdwGiHXsH8iQ7QWgp/DzjCWPuxK+hgd+zY8vNXMECLDCkg0gS9d7p3u KSSbse5MoR2EQjZ9+hIROKJqMEMEcbbfgFBo13UCsywNgIshCJ9375ohcqVyYFN+waTT uperXz2JBJOo80b/CL4KC3OwK8N+hDucVPR2h0IAiDUtbosZW7iLT7Aco4rKrR4BDo08 vzXWO5DLCxBnHB9f6iPruWZ+SnVsQtXz5A9Mt5BsdhzRlRtNs6/kQmdScsm/cAoolExk GZ/g== X-Gm-Message-State: APjAAAWxOpukoFsPyoNKLw1+RybPMyEMZ0iV3PZAQgAOiJ43/vqyLqHb ji6OwtJKSybAwrGmAthrWOSbrMIx X-Google-Smtp-Source: APXvYqy/1G4B6HqU+EboMhUVJ7cAjkxMTHHOjgtxK0WzHLpRgslZvRSPBiA8N2CS7j1PzzcOqfV/ow== X-Received: by 2002:ac2:443c:: with SMTP id w28mr5782942lfl.38.1557489917200; Fri, 10 May 2019 05:05:17 -0700 (PDT) Received: from localhost.localdomain ([213.185.29.22]) by smtp.gmail.com with ESMTPSA id g20sm1309680lja.67.2019.05.10.05.05.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 May 2019 05:05:16 -0700 (PDT) From: Jacob Kroon To: grub-devel@gnu.org Subject: [PATCH v3] probe: Support probing for GPT partition UUID with -q Date: Fri, 10 May 2019 14:05:02 +0200 Message-Id: <20190510120502.17102-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::141 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: Fri, 10 May 2019 12:05:21 -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 --- grub-core/commands/probe.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) Changes since v2: * Add a proper commit message * Handle endianess in the same way as is currently done in util/grub-probe.c:print_gpt_guid () diff --git a/grub-core/commands/probe.c b/grub-core/commands/probe.c index 95d272287..24742c181 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,39 @@ 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; + guid->data1 = grub_le_to_cpu32 (guid->data1); + guid->data2 = grub_le_to_cpu16 (guid->data2); + guid->data3 = grub_le_to_cpu16 (guid->data3); + 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