[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#738919: marked as done (parted3 preparations)

Your message dated Tue, 10 Jun 2014 10:03:02 -0400
with message-id <53971016.4060309@ubuntu.com>
and subject line Close
has caused the Debian Bug report #738919,
regarding parted3 preparations
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
738919: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=738919
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
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.000000000 -0500
+++ partman-ext3-82/active_partition/ext3/choices	2014-02-13 14:07:41.000000000 -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.000000000 -0400
+++ partman-ext3-82/check.d/alignment_ext3	2014-02-13 14:10:12.000000000 -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.000000000 -0500
+++ partman-ext3-82/check.d/nomountpoint_ext3	2014-02-13 14:13:25.000000000 -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_ext3	2011-01-19 00:01:08.000000000 -0500
+++ partman-ext3-82/commit.d/format_ext3	2014-02-13 14:14:22.000000000 -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/changelog	2013-12-18 15:57:36.000000000 -0500
+++ partman-ext3-82/debian/changelog	2014-02-13 14:16:19.000000000 -0500
@@ -1,3 +1,9 @@
+partman-ext3 (82) unstable; urgency=low
+
+  * Pick up support for ext2
+
+ -- Phillip Susi <psusi@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.000000000 -0400
+++ partman-ext3-82/debian/partman-ext3.templates	2014-02-13 16:02:34.000000000 -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_ext3	2011-01-19 00:01:08.000000000 -0500
+++ partman-ext3-82/finish.d/aptinstall_ext3	2014-02-13 14:15:00.000000000 -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/ext3	2011-01-19 00:01:08.000000000 -0500
+++ partman-ext3-82/fstab.d/ext3	2014-02-13 14:05:31.000000000 -0500
@@ -13,7 +13,7 @@
 		method=$(cat $id/method)
 		filesystem=$(cat $id/acting_filesystem)
 		case "$filesystem" in
-		    ext3|ext4)
+		    ext2|ext3|ext4)
 			[ -f "$id/mountpoint" ] || continue
 			mountpoint=$(cat $id/mountpoint)
 			# due to #249322, #255135, #258117:
diff -Nru partman-ext3-81/mount.d/ext3 partman-ext3-82/mount.d/ext3
--- partman-ext3-81/mount.d/ext3	2011-01-19 00:01:08.000000000 -0500
+++ partman-ext3-82/mount.d/ext3	2014-02-13 14:04:29.000000000 -0500
@@ -10,7 +10,7 @@
 pass=$6
 
 case $type in
-    ext3|ext4)
+    ext2|ext3|ext4)
 	mount -t $type ${options:+-o "$options"} $fs /target$mp || exit 1
 	echo "umount /target$mp"
 	exit 0
diff -Nru partman-ext3-81/mountoptions/ext2 partman-ext3-82/mountoptions/ext2
--- partman-ext3-81/mountoptions/ext2	1969-12-31 19:00:00.000000000 -0500
+++ partman-ext3-82/mountoptions/ext2	2014-02-13 14:03:28.000000000 -0500
@@ -0,0 +1,10 @@
+noatime
+relatime
+nodev
+nosuid
+noexec
+ro
+sync
+usrquota
+grpquota
+user_xattr
diff -Nru partman-ext3-81/parted_names/ext2 partman-ext3-82/parted_names/ext2
--- partman-ext3-81/parted_names/ext2	1969-12-31 19:00:00.000000000 -0500
+++ partman-ext3-82/parted_names/ext2	2014-02-13 14:03:52.000000000 -0500
@@ -0,0 +1 @@
+ext2
diff -Nru partman-ext3-81/valid_filesystems/ext2 partman-ext3-82/valid_filesystems/ext2
--- partman-ext3-81/valid_filesystems/ext2	1969-12-31 19:00:00.000000000 -0500
+++ partman-ext3-82/valid_filesystems/ext2	2014-02-13 14:02:46.000000000 -0500
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+dev=$1
+id=$2
+property=$3
+
+[ -f /var/lib/partman/ext2 ] || exit 0
+
+case $property in
+    formatable)
+	echo ext2
+	;;
+    existing)
+	[ -f $id/detected_filesystem ] || exit 0
+	fs=$(cat $id/detected_filesystem)
+
+	case "$fs" in
+	    ext2)
+		echo ext2
+		;;
+	esac
+	;;
+esac
+
+
diff -Nru partman-ext3-81/valid_filesystems/_numbers partman-ext3-82/valid_filesystems/_numbers
--- partman-ext3-81/valid_filesystems/_numbers	2011-02-12 21:00:25.000000000 -0500
+++ partman-ext3-82/valid_filesystems/_numbers	2014-02-13 14:02:58.000000000 -0500
@@ -1,2 +1,3 @@
+04 ext2
 06 ext3
 05 ext4

Attachment: signature.asc
Description: OpenPGP digital signature


--- End Message ---
--- Begin Message --- 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Closing bug report since #738922 has been redone without modifying partman-ext3.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJTlxAWAAoJEI5FoCIzSKrwOiMIAJWTK3pOBtHt90c5UaOVLM73
moqygFfYG43wZwfeT4xcowrqjUDOlDNP0oer9GhHIPA7KTwlx2z3jEoyritxkjvh
gVciNNakn0NKIO2h50n8zrqA67ZKPdSGic0OO+fluGB+nGk/qkfcGpgs8BGQpxSO
4JRvqU73rLOOnvNQmpktMWamfIvBPC/AFAlOsq+lGtF28DGGkTt4SdD9ovF99O/O
JpVMRQZDXngdVRuQzvnCoY/qfnag4BE1Ijv1fdK1ifzDrzc39SK72hRXiBMKEaIY
CbepjBxCO3nuYDcDUJgP0V0p8WgpoCIbzNDd0+N3hhwPn7/ex7ofpvGMvXDLh9M=
=UBsj
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: