From debbugs-submit-bounces@debbugs.gnu.org Sun May 26 11:19:39 2024 Received: (at submit) by debbugs.gnu.org; 26 May 2024 15:19:39 +0000 Received: from localhost ([127.0.0.1]:42265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBFet-0005nU-5f for submit@debbugs.gnu.org; Sun, 26 May 2024 11:19:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:38722) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBFeq-0005nM-OD for submit@debbugs.gnu.org; Sun, 26 May 2024 11:19:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sBFei-000576-8S for guix-patches@gnu.org; Sun, 26 May 2024 11:19:28 -0400 Received: from mout-p-103.mailbox.org ([2001:67c:2050:0:465::103]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1sBFef-0001C7-P6 for guix-patches@gnu.org; Sun, 26 May 2024 11:19:27 -0400 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4VnMrN66qsz9sWV for ; Sun, 26 May 2024 17:19:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1716736756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=Cocb5rGKhuy09/3wqKGzglW5MSfd+i7jGqvvDWjYwqY=; b=i4Yre8G39w4JfLvFRiAdKbx0SIUIPpwHi02AuGIIxjopQ5+lx18AZ1f9nGOKf3CgDkYIS5 wlUNVbYQLQTksH5gNLrzl7qAimBoGHTGNOmNyGFlPrbveTNmLfWQ1H7eeJ7VE3s5zYTTVP Om7oxTk6LqYxbRP/XElph+kF3Ph8zpOapx425NzwOn6v/Ecw4XpjV7vrmpKSBbXt1eworU btdsRz8vn3P49mgN+S99t812zvrS6Z18s81dG5uo0x3gp0gmNOBwihWtaUGO+0AoBiZ6oz L1GN7AZB8Lx7tesXHVnDxJ+dZaSbInB1eNl8j3NcIcCF8KSxyOyvDIWawj0+UA== Date: Sun, 26 May 2024 17:19:12 +0200 From: Lars-Dominik Braun To: guix-patches@gnu.org Subject: [PATCH] gnu: grub: Ignore metadata-csum-seed feature of ext4. Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Rspamd-Queue-Id: 4VnMrN66qsz9sWV Received-SPF: pass client-ip=2001:67c:2050:0:465::103; envelope-from=lars@6xq.net; helo=mout-p-103.mailbox.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * gnu/packages/patches/grub-ignore-metadata-csum-seed.patch: New file. * gnu/local.mk: Register it. * gnu/packages/bootloaders.scm (grub): Use it. Change-Id: I3bfed24b38ecf31b85ed4ac654399fca2d2e12f6 --- This patch fixes issue 70480. Validated using the root-unmount system test. gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 3 +- .../grub-ignore-metadata-csum-seed.patch | 54 +++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/grub-ignore-metadata-csum-seed.patch diff --git a/gnu/local.mk b/gnu/local.mk index 502e97ecd5..7e9e1ebcf0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1415,6 +1415,7 @@ dist_patch_DATA = \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \ %D%/packages/patches/grub-setup-root.patch \ + %D%/packages/patches/grub-ignore-metadata-csum-seed.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-2.2-skip-so-test.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 20af6fcee1..f37344c25b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -113,7 +113,8 @@ (define-public grub "1qbycnxkx07arj9f2nlsi9kp0dyldspbv07ysdyd34qvz55a97mp")) (patches (search-patches "grub-efi-fat-serial-number.patch" - "grub-setup-root.patch")) + "grub-setup-root.patch" + "grub-ignore-metadata-csum-seed.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/grub-ignore-metadata-csum-seed.patch b/gnu/packages/patches/grub-ignore-metadata-csum-seed.patch new file mode 100644 index 0000000000..cd9b897aa6 --- /dev/null +++ b/gnu/packages/patches/grub-ignore-metadata-csum-seed.patch @@ -0,0 +1,54 @@ +commit 7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 +Author: Javier Martinez Canillas +Date: Fri Jun 11 21:36:16 2021 +0200 + + fs/ext2: Ignore checksum seed incompat feature + + This incompat feature is used to denote that the filesystem stored its + metadata checksum seed in the superblock. This is used to allow tune2fs + changing the UUID on a mounted metdata_csum filesystem without having + to rewrite all the disk metadata. However, the GRUB doesn't use the + metadata checksum at all. So, it can just ignore this feature if it + is enabled. This is consistent with the GRUB filesystem code in general + which just does a best effort to access the filesystem's data. + + The checksum seed incompat feature has to be removed from the ignore + list if the support for metadata checksum verification is added to the + GRUB ext2 driver later. + + Suggested-by: Eric Sandeen + Suggested-by: Lukas Czerner + Signed-off-by: Javier Martinez Canillas + Reviewed-by: Lukas Czerner + Reviewed-by: Daniel Kiper + +diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c +index e7dd78e66..4953a1591 100644 +--- a/grub-core/fs/ext2.c ++++ b/grub-core/fs/ext2.c +@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); + #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 + #define EXT4_FEATURE_INCOMPAT_MMP 0x0100 + #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 ++#define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000 + #define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000 + + /* The set of back-incompatible features this driver DOES support. Add (OR) +@@ -123,10 +124,15 @@ GRUB_MOD_LICENSE ("GPLv3+"); + * mmp: Not really back-incompatible - was added as such to + * avoid multiple read-write mounts. Safe to ignore for this + * RO driver. ++ * checksum seed: Not really back-incompatible - was added to allow tools ++ * such as tune2fs to change the UUID on a mounted metadata ++ * checksummed filesystem. Safe to ignore for now since the ++ * driver doesn't support checksum verification. However, it ++ * has to be removed from this list if the support is added later. + */ + #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \ +- | EXT4_FEATURE_INCOMPAT_MMP) +- ++ | EXT4_FEATURE_INCOMPAT_MMP \ ++ | EXT4_FEATURE_INCOMPAT_CSUM_SEED) + + #define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U + base-commit: 83fc6c7f72fcab3a68c82dd02f872429d632a2c0 prerequisite-patch-id: f5b496d7bc4037f90bafa2f243ec14cc4440fb70 -- 2.44.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 27 13:33:03 2024 Received: (at 71210-done) by debbugs.gnu.org; 27 May 2024 17:33:03 +0000 Received: from localhost ([127.0.0.1]:45170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBeDW-0007uF-Pi for submit@debbugs.gnu.org; Mon, 27 May 2024 13:33:03 -0400 Received: from mout-p-103.mailbox.org ([80.241.56.161]:48528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBeDU-0007te-DE for 71210-done@debbugs.gnu.org; Mon, 27 May 2024 13:33:01 -0400 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4Vp2ls2LDdz9sTx for <71210-done@debbugs.gnu.org>; Mon, 27 May 2024 19:32:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1716831161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CikcLbSKCxwtUqUll7sl1gawL6RNRUjGoSksZ0c88i8=; b=Cf/ni2Jx3+oZdWrgkGRweZEwFqlOuI2CbDSQ/2S3KvOkJHiDaM9Qp7T2Npnm4obuTBqgZm 0oMYdd3Sh+oM7YuXRE0Tcaba5MpVnvLk6GioEXK/Rq6e+124MWdLF6miq0xThVrXGnwOCg JkXZ1rl87VFXHnSgXvzrmeB8TX6iY/sUdfveiG/Tjjoe8H3ASXNItBIhB5wNMSy4+bOUOS Gz1bqHquPAuXguLuT4lRBDuFvtnd3tIqXwQNB5u8rGf/NbLLX0voayOC3ULAJtJSeMRnRd wAtJ/FHuCIel2MUwbTVznQFK6coYI7etCAmvUdxczqc3BP7dMPz4eAfkDKPlYw== Date: Mon, 27 May 2024 19:32:39 +0200 From: Lars-Dominik Braun To: 71210-done@debbugs.gnu.org Subject: Re: bug#71210: Acknowledgement ([PATCH] gnu: grub: Ignore metadata-csum-seed feature of ext4.) Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4Vp2ls2LDdz9sTx X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71210-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, I pushed this patch as 00384aedbc6a371aaf90ca344a446952fdd5a6b3 after (positive) feedback from IRC. Lars From unknown Tue Jun 17 03:39:41 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 25 Jun 2024 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator