Ubuntu
e2fsprogs package

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

  1. Git
  2. lp:~upils/ubuntu/+source/e2fsprogs
  3. disable-orphan-file-feature
  4. Merge into ubuntu/devel
Proposed by Paul Mars
Status: Superseded
Proposed branch: ~upils/ubuntu/+source/e2fsprogs:disable-orphan-file-feature
Merge into: ubuntu/+source/e2fsprogs:ubuntu/devel
Diff against target: 64 lines (+18/-1) (has conflicts)
4 files modified
debian/changelog (+8/-0)
debian/patches/default-to-4k.patch (+4/-0)
debian/patches/series (+5/-0)
misc/mke2fs.conf.in (+1/-1)
Conflict in debian/changelog
Conflict in debian/patches/default-to-4k.patch
Conflict in debian/patches/series
Reviewer Review Type Date Requested Status
Canonical Foundations Team Pending
Ubuntu Sponsors Pending
git-ubuntu import Pending
Review via email: mp+454787@code.launchpad.net

This proposal has been superseded by a proposal from 2023-10-30.

Commit message

Cherry-picked existing mantic fix d23608d502300e36743905e762e4ce2df44202d7

Fix LP: #2025339 and LP: #2028564

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

please rebase, there are merge conflicts

Unmerged commits

832a4af... by Paul Mars

update changelog

d23608d... by Theodore Ts'o

Disable metadata_csum_seed and orphan_file by default for Debian

Gbp-Pq: disable-metadata_csum_seed-and-orphan_file-by-default.

4810207... by Julian Andres Klode

1.47.0-1ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 43a94ba..41ea797 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,4 @@
6+<<<<<<< debian/changelog
7 e2fsprogs (1.47.0-2ubuntu1) mantic; urgency=medium
8
9 * Merge from Debian Unstable. Remaining changes:
10@@ -21,6 +22,13 @@ e2fsprogs (1.47.0-1ubuntu2) mantic; urgency=medium
11 SRUed into jammy. LP: #2025339
12
13 -- Dimitri John Ledkov <dimitri.ledkov@canonical.com> Thu, 29 Jun 2023 10:14:32 +0100
14+=======
15+e2fsprogs (1.47.0-1ubuntu2) lunar; urgency=medium
16+
17+ * Disable the orphan_file feature (LP: #2025339)
18+
19+ -- Paul Mars <paul.mars@canonical.com> Fri, 27 Oct 2023 18:44:01 +0200
20+>>>>>>> debian/changelog
21
22 e2fsprogs (1.47.0-1ubuntu1) lunar; urgency=low
23
24diff --git a/debian/patches/default-to-4k.patch b/debian/patches/default-to-4k.patch
25index a47f531..c0c9268 100644
26--- a/debian/patches/default-to-4k.patch
27+++ b/debian/patches/default-to-4k.patch
28@@ -7,7 +7,11 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/1817097
29 --- a/misc/mke2fs.conf.in
30 +++ b/misc/mke2fs.conf.in
31 @@ -14,11 +14,9 @@
32+<<<<<<< debian/patches/default-to-4k.patch
33 features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
34+=======
35+ features = has_journal,extent,huge_file,flex_bg,metadata_csum,metadata_csum_seed,64bit,dir_nlink,extra_isize,orphan_file
36+>>>>>>> debian/patches/default-to-4k.patch
37 }
38 small = {
39 - blocksize = 1024
40diff --git a/debian/patches/series b/debian/patches/series
41index 47e0720..1213ced 100644
42--- a/debian/patches/series
43+++ b/debian/patches/series
44@@ -1,2 +1,7 @@
45+<<<<<<< debian/patches/series
46 disable-metadata_csum_seed-and-orphan_file-by-default
47 default-to-4k.patch
48+=======
49+default-to-4k.patch
50+default-no-metadata_csum_seed.patch
51+>>>>>>> debian/patches/series
52diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
53index b7fc95d..0568099 100644
54--- a/misc/mke2fs.conf.in
55+++ b/misc/mke2fs.conf.in
56@@ -11,7 +11,7 @@
57 features = has_journal
58 }
59 ext4 = {
60- features = has_journal,extent,huge_file,flex_bg,metadata_csum,metadata_csum_seed,64bit,dir_nlink,extra_isize,orphan_file
61+ features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
62 }
63 small = {
64 blocksize = 1024

Subscribers

People subscribed via source and target branches