Merge ~upils/ubuntu/+source/e2fsprogs:disable-orphan-file-feature into ubuntu/+source/e2fsprogs:ubuntu/lunar-devel

[Paul Mars]

Cherry-picked existing mantic fix d23608d502300e36743905e762e4ce2df44202d7

Fix LP: #2025339 and LP: #2028564

[Steve Langasek (vorlon)]

please rebase, there are merge conflicts

[Paul Mars (upils)]

I had selected the wrong target (ubuntu/devel instead of ubuntu/lunar-devel). This is now fixed.

[Bryce Harrington (bryce)]

The diff for this disables not just orphan_file but also metadata_csum_seed. Please mention the latter in the changelog as well. It appears this follows what Debian is doing as a fix to Debb #1030939.

https://bugs.launchpad.net/ubuntu/+source/e2fsprogs/+bug/2025339/comments/7

I'd suggest either discussing that bug+fix in LP: #2025339. You could add a [Fix] section to the bug's SRU template to identify the two fixes, that they came from debian, and give links to the corresponding bugs. Alternatively, file a separate LP SRU bug for metadata_csum_seed and link that to the debian bug.

Btw do you also have an MP for the corresponding jammy branch for this SRU? We should probably handle sponsorship of both together at the same time.

review: Needs Information

[Paul Mars (upils)]

Thanks for the guidance. I did not submit a MP to jammy because the version 1.47 of e2fsprogs was not backported to jammy. In the previous version these features were not enabled by default, so I understand that there is nothing to fix on jammy.

I am fine with having both fixes in the same SRU since this is fixing the same global issue and was also fixed together in other series.

I edited the SRU, let me know if this is what you expected.

[Nick Rosbrook (enr0n)]

I left a comment on the diff.

review: Needs Fixing

816680a... by Paul Mars on 2023-11-03

Also disable orphan_file in the patch to let lunar based machine generate FS valid for jammy and older

f017ac7... by Paul Mars on 2023-11-03

update changelog

[Nick Rosbrook (enr0n)]

One last thing I noticed -- the only change is the orphan_file option being dropped. Bryce's original comment about metadata_csum_seed was based on the source diff (rather than the diff to the existing patch), so this was not clear before.

So you actually should not mention metadata_csum_seed in the changelog. Once that's fixed, I will be happy to sponsor this.

review: Needs Fixing

[Paul Mars (upils)]

As explained in [1] this MP is rejected because the bug won't be fixed on Lunar.

racb can you reject the MP? It looks like I cannot do it myself.

[1] https://bugs.launchpad.net/ubuntu/+source/e2fsprogs/+bug/2025339/comments/13

Unmerged commits

f017ac7... by Paul Mars on 2023-11-03

update changelog

816680a... by Paul Mars on 2023-11-03

Also disable orphan_file in the patch to let lunar based machine generate FS valid for jammy and older

diff --git a/debian/changelog b/debian/changelog
index 90a8c6b..84f9380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+e2fsprogs (1.47.0-1ubuntu1.1) lunar; urgency=medium
+
+  * Disable orphan_file feature so that filesystems created on
+    lunar can be used on jammy (LP: #2025339)
+
+ -- Paul Mars <[e-mail]>  Fri, 03 Nov 2023 16:35:52 +0100
+
 e2fsprogs (1.47.0-1ubuntu1) lunar; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/debian/patches/default-no-metadata_csum_seed.patch b/debian/patches/default-no-metadata_csum_seed.patch
index 69d243d..68f341e 100644
--- a/debian/patches/default-no-metadata_csum_seed.patch
+++ b/debian/patches/default-no-metadata_csum_seed.patch
@@ -1,9 +1,11 @@
-Description: Do not set metadata_csum_seed
- Our grub doesn ot handle it yet.
+Description: Do not set metadata_csum_seed nor orphan_file
+ Our grub does not handle it yet.
 Author: Julian Andres Klode <[e-mail]>
 Origin: vendor
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1030939
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/e2fsprogs/+bug/2025339
 Forwarded: not-needed
+Last-Update: 2023-11-03
 --- a/misc/mke2fs.conf.in
 +++ b/misc/mke2fs.conf.in
 @@ -11,7 +11,7 @@
@@ -11,7 +13,7 @@ Forwarded: not-needed
  	}
  	ext4 = {
 -		features = has_journal,extent,huge_file,flex_bg,metadata_csum,metadata_csum_seed,64bit,dir_nlink,extra_isize,orphan_file
-+		features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize,orphan_file
++		features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
  	}
  	small = {
  		inode_ratio = 4096