From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1mw1W2-0005Ci-Ec for mharc-grub-devel@gnu.org; Sat, 11 Dec 2021 07:30:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mw1W0-0005CW-NU for grub-devel@gnu.org; Sat, 11 Dec 2021 07:30:12 -0500 Received: from jpoiret.xyz ([206.189.101.64]:32830) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mw1Vy-0006ol-Sl for grub-devel@gnu.org; Sat, 11 Dec 2021 07:30:12 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id B1AA0184F6A; Sat, 11 Dec 2021 12:30:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1639225808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6IFprLKsowO6dkNfpce7GtBD41hoBP/Ai4ET9Mbhurs=; b=Drs3JtwrGrsmq0PTAt2UCFCNzObxviGa0nijC/6r4smgJTvZur2s+ueSkoHSINmjlxXL4d 7RnyeOVFKk4y0gyqlMoY3TwghEN4aqNwgMpL2LgqoA3Sj6z/PDUf9mYEpUvX7RbfZYSWp7 cgZiBxwNFyQeyar6AlBhdvv1+MjvKP6ZCvbXAngNhjW05AsW5pBQCWxWkIfFFGMz/UVeZa SzORk15EJa83TDGiwQ2fwgy7KY3wYQFW2TqFLfY7xzKRn5USUn274WT2ddiAVDlmdcLHgz S9m6iHUbCrJHz8uJ/2myCVgS78QnnNGAmp2Thq5OVMn3zYdnXm8MtzwzXO7m5A== From: Josselin Poiret To: Glenn Washburn Cc: grub-devel@gnu.org, Josselin Poiret Subject: [PATCH v2 1/2] devmapper/getroot: Have devmapper recognize LUKS2 Date: Sat, 11 Dec 2021 13:29:44 +0100 Message-Id: <20211211122945.6326-2-dev@jpoiret.xyz> In-Reply-To: <20211211122945.6326-1-dev@jpoiret.xyz> References: <20211209141526.002e83a4@crass-HP-ZBook-15-G2> <20211211122945.6326-1-dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: 3 X-Spam_score: 0.3 X-Spam_bar: / X-Spam_report: (0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.498, PDS_OTHER_BAD_TLD=1.856, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Dec 2021 12:30:13 -0000 Changes UUID comparisons so that LUKS1 and LUKS2 are both recognized as being LUKS cryptodisks. --- grub-core/osdep/devmapper/getroot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/grub-core/osdep/devmapper/getroot.c b/grub-core/osdep/devmapper/getroot.c index 9ba5c9865..ad1daf9c8 100644 --- a/grub-core/osdep/devmapper/getroot.c +++ b/grub-core/osdep/devmapper/getroot.c @@ -138,7 +138,7 @@ grub_util_get_dm_abstraction (const char *os_dev) grub_free (uuid); return GRUB_DEV_ABSTRACTION_LVM; } - if (strncmp (uuid, "CRYPT-LUKS1-", 12) == 0) + if (strncmp (uuid, "CRYPT-LUKS", sizeof ("CRYPT-LUKS") - 1) == 0) { grub_free (uuid); return GRUB_DEV_ABSTRACTION_LUKS; @@ -179,7 +179,7 @@ grub_util_pull_devmapper (const char *os_dev) grub_util_pull_device (subdev); } } - if (uuid && strncmp (uuid, "CRYPT-LUKS1-", sizeof ("CRYPT-LUKS1-") - 1) == 0 + if (uuid && strncmp (uuid, "CRYPT-LUKS", sizeof ("CRYPT-LUKS") - 1) == 0 && lastsubdev) { char *grdev = grub_util_get_grub_dev (lastsubdev); @@ -253,11 +253,11 @@ grub_util_get_devmapper_grub_dev (const char *os_dev) { char *dash; - dash = grub_strchr (uuid + sizeof ("CRYPT-LUKS1-") - 1, '-'); + dash = grub_strchr (uuid + sizeof ("CRYPT-LUKS*-") - 1, '-'); if (dash) *dash = 0; grub_dev = grub_xasprintf ("cryptouuid/%s", - uuid + sizeof ("CRYPT-LUKS1-") - 1); + uuid + sizeof ("CRYPT-LUKS*-") - 1); grub_free (uuid); return grub_dev; } -- 2.34.0