Bug#738919: parted3 preparations

[Colin Watson]

On Thu, Feb 13, 2014 at 04:46:36PM -0500, Phillip Susi wrote:
 In preparation for the parted3 transition, this patch adds ext2 support
 to partman-ext3, since my other patch removes ext2 from
 partman-basicfilesystems.

As I said as part of my comments on #738922, I think this is needless
churn that just makes the transition more complicated.  Unless there is
a reason beyond aesthetics to move ext2 support, I think we should leave
it where it is.

-- 
Colin Watson   [cjwat...@debian.org]


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#738919: parted3 preparations

[Phillip Susi]

Package: partman-ext3
Tags: patch

In preparation for the parted3 transition, this patch adds ext2 support
to partman-ext3, since my other patch removes ext2 from
partman-basicfilesystems.

diff -Nru partman-ext3-81/active_partition/ext3/choices 
partman-ext3-82/active_partition/ext3/choices
--- partman-ext3-81/active_partition/ext3/choices   2011-01-19 
00:01:08.0 -0500
+++ partman-ext3-82/active_partition/ext3/choices   2014-02-13 
14:07:41.0 -0500
@@ -15,7 +15,7 @@
 filesystem=$(cat $part/acting_filesystem)
 
 case $filesystem in
-ext3|ext4)
+ext2|ext3|ext4)
:
;;
 *)
@@ -46,7 +46,7 @@
  -o $part/formatted -ot $part/method \
  -o $part/formatted -ot $part/filesystem ] || return 0
case $filesystem in
-   ext3|ext4)
+   ext2|ext3|ext4)
if [ -f $part/label ]; then
label=$(cat $part/label)
else
diff -Nru partman-ext3-81/check.d/alignment_ext3 
partman-ext3-82/check.d/alignment_ext3
--- partman-ext3-81/check.d/alignment_ext3  2011-07-23 21:02:07.0 
-0400
+++ partman-ext3-82/check.d/alignment_ext3  2014-02-13 14:10:12.0 
-0500
@@ -24,7 +24,7 @@
filesystem=$(cat $id/acting_filesystem)
mountpoint=$(cat $id/mountpoint)
case $filesystem in
-   ext3|ext4)
+   ext2|ext3|ext4)
if [ -f $id/formatted ]  \
   [ $id/formatted -nt $id/method ]  \
   ([ ! -f $id/filesystem ] || \
diff -Nru partman-ext3-81/check.d/nomountpoint_ext3 
partman-ext3-82/check.d/nomountpoint_ext3
--- partman-ext3-81/check.d/nomountpoint_ext3   2011-01-19 00:01:08.0 
-0500
+++ partman-ext3-82/check.d/nomountpoint_ext3   2014-02-13 14:13:25.0 
-0500
@@ -20,7 +20,7 @@
[ -f $id/acting_filesystem ] || continue
filesystem=$(cat $id/acting_filesystem)
case $filesystem in
-   ext3|ext4)
+   ext2|ext3|ext4)
[ ! -f $id/mountpoint ] || continue
RET=''
db_metaget partman/filesystem_short/$filesystem 
description || RET=''
diff -Nru partman-ext3-81/commit.d/format_ext3 
partman-ext3-82/commit.d/format_ext3
--- partman-ext3-81/commit.d/format_ext32011-01-19 00:01:08.0 
-0500
+++ partman-ext3-82/commit.d/format_ext32014-02-13 14:14:22.0 
-0500
@@ -22,7 +22,7 @@
  -a -f $id/acting_filesystem ] || continue
filesystem=$(cat $id/acting_filesystem)
case $filesystem in
-   ext3|ext4)
+   ext2|ext3|ext4)
if [ -f $id/formatted ]  \
   [ $id/formatted -nt $id/method ]  \
   ([ ! -f $id/filesystem ] || \
diff -Nru partman-ext3-81/debian/changelog partman-ext3-82/debian/changelog
--- partman-ext3-81/debian/changelog2013-12-18 15:57:36.0 -0500
+++ partman-ext3-82/debian/changelog2014-02-13 14:16:19.0 -0500
@@ -1,3 +1,9 @@
+partman-ext3 (82) unstable; urgency=low
+
+  * Pick up support for ext2
+
+ -- Phillip Susi ps...@ubuntu.com  Thu, 13 Feb 2014 14:15:28 -0500
+
 partman-ext3 (81) unstable; urgency=low
 
   [ Updated translations ]
diff -Nru partman-ext3-81/debian/partman-ext3.templates 
partman-ext3-82/debian/partman-ext3.templates
--- partman-ext3-81/debian/partman-ext3.templates   2011-07-23 
21:02:07.0 -0400
+++ partman-ext3-82/debian/partman-ext3.templates   2014-02-13 
16:02:34.0 -0500
@@ -1,3 +1,14 @@
+Template: partman/filesystem_long/ext2
+Type: text
+# :sl2:
+_Description: Ext2 file system
+
+Template: partman/filesystem_short/ext2
+Type: text
+# :sl1:
+# Short file system name (untranslatable in many languages)
+_Description: ext2
+
 Template: partman-ext3/text/ext3
 Type: text
 # :sl1:
diff -Nru partman-ext3-81/finish.d/aptinstall_ext3 
partman-ext3-82/finish.d/aptinstall_ext3
--- partman-ext3-81/finish.d/aptinstall_ext32011-01-19 00:01:08.0 
-0500
+++ partman-ext3-82/finish.d/aptinstall_ext32014-02-13 14:15:00.0 
-0500
@@ -14,7 +14,7 @@
[ -f $id/method -a -f $id/acting_filesystem ] || continue
filesystem=$(cat $id/acting_filesystem)
case $filesystem in
-   ext3|ext4)
+   ext2|ext3|ext4)
ext3=yes
;;
esac
diff -Nru partman-ext3-81/fstab.d/ext3 partman-ext3-82/fstab.d/ext3
--- partman-ext3-81/fstab.d/ext32011-01-19 00:01:08.0 -0500
+++ partman-ext3-82/fstab.d/ext32014-02-13 14:05:31.0 -0500
@@ -13,7 +13,7 @@
method=$(cat $id/method)
filesystem=$(cat $id/acting_filesystem)
case $filesystem in
-