From 4139c6f66b2b7a6685a681aea1caf340f66839fa Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Mon, 30 Apr 2012 10:37:53 +0000
Subject: drop support for reiser4 (mga#5680)

---
 kernel/list_modules.pm                | 2 +-
 perl-install/NEWS                     | 2 ++
 perl-install/diskdrake/interactive.pm | 4 ++--
 perl-install/fs/format.pm             | 3 ---
 perl-install/fs/type.pm               | 5 +----
 perl-install/install/NEWS             | 3 +++
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index bbd72b1d2..0a59be2e4 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -202,7 +202,7 @@ our %l = (
     loopback => [ qw(isofs loop squashfs) ],
     local => [
       if_(arch() =~ /^ppc/, qw(hfs)),
-      qw(btrfs ext3 ext4 jfs nilfs2 ntfs reiserfs reiser4 vfat xfs),
+      qw(btrfs ext3 ext4 jfs nilfs2 ntfs reiserfs vfat xfs),
     ],
     various => [ qw(romfs ufs unionfs) ],
 
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 111be93dc..7af5a8b2d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -9,6 +9,8 @@
   to make curl quiet when running an autoinstall in text mode. This can
   be set throught the new option "curl_options" in the auto_inst file.
   Also, use '-s' by default when downloading VERSION and auto_inst file.
+- diskdrake:
+  o drop support for reiser4 (mga#5680)
 - harddrake service:
   o do not disable cpufreq on non-laptops
   o remove double apmd check
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index fb60f280d..9528194ba 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -568,7 +568,7 @@ First remove a primary partition and create an extended partition."));
 	if ($::isStandalone) {
 	    fs::format::check_package_is_installed_format($in->do_pkgs, $p->{fs_type}) or log::l("Missing package");
 	}
-	if ($::expert && !member($p->{fs_type}, 'reiserfs', 'reiser4', 'xfs', 'hfs', 'ntfs', 'ntfs-3g')) {
+	if ($::expert && !member($p->{fs_type}, 'reiserfs', 'xfs', 'hfs', 'ntfs', 'ntfs-3g')) {
 	    $p->{toFormatCheck} = $in->ask_yesorno(N("Confirmation"), N("Check for bad blocks?"));
 	}
 	$p->{isFormatted} = 0; #- force format;
@@ -1290,7 +1290,7 @@ sub format_ {
     if ($::isStandalone) {
 	fs::format::check_package_is_installed_format($in->do_pkgs, $part->{fs_type}) or return;
     }
-    if ($::expert && !member($part->{fs_type}, 'reiserfs', 'reiser4', 'xfs', 'hfs', 'ntfs', 'ntfs-3g')) {
+    if ($::expert && !member($part->{fs_type}, 'reiserfs', 'xfs', 'hfs', 'ntfs', 'ntfs-3g')) {
 	$part->{toFormatCheck} = $in->ask_yesorno(N("Confirmation"), N("Check for bad blocks?"));
     }
     $part->{isFormatted} = 0; #- force format;
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 6e4568da7..c511cf51d 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -15,7 +15,6 @@ my %cmds = (
     ext3     => [ 'e2fsprogs', 'mkfs.ext3', '-F' ],
     ext4     => [ 'e2fsprogs', 'mkfs.ext4', '-F' ],
     reiserfs => [ 'reiserfsprogs', 'mkfs.reiserfs', '-ff' ],
-    reiser4  => [ 'reiser4progs', 'mkfs.reiser4', '-f', '-y' ],
     xfs      => [ 'xfsprogs', 'mkfs.xfs', '-f', '-q' ],
     jfs      => [ 'jfsutils', 'mkfs.jfs', '-f' ],
     hfs      => [ 'hfsutils', 'hformat' ],
@@ -33,7 +32,6 @@ my %LABELs = ( #- option, length, handled_by_mount
     ext3     => [ '-L', 16, 1 ],
     ext4     => [ '-L', 16, 1 ],
     reiserfs => [ '-l', 16, 1 ],
-    reiser4  => [ '-L', 16, 1 ],
     xfs      => [ '-L', 12, 1 ],
     jfs      => [ '-L', 16, 1 ],
     hfs      => [ '-l', 27, 0 ],
@@ -53,7 +51,6 @@ my %edit_LABEL = ( # package, command, option
     ext3     => [ 'e2fsprogs', 'tune2fs', '-L' ],
     ext4     => [ 'e2fsprogs', 'tune2fs', '-L' ],
     reiserfs => [ 'reiserfsprogs', 'reiserfstune', '-l' ],
-#    reiser4
     xfs      => [ 'xfsprogs', 'xfs_admin', '-L' ],
     jfs      => [ 'jfsutils', 'jfs_tune', '-L' ],
 #    hfs
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 18c4f56dd..6318e6804 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -119,9 +119,6 @@ if_(arch() !~ /ppc/,
   0x75 => '',         'PC/IX',
   0x80 => '',         'Old Minix',
   0x81 => '',         'Minix / old Linux',
- if_(!$::isInstall,
-  0x83 => 'reiser4',  'Journalised FS: Reiser4',
- ),
   0x83 => 'nilfs2',   'NILFS2',
   0x83 => 'btrfs',    'Btrfs',
   0x84 => '',         'OS/2 hidden C: drive',
@@ -312,7 +309,7 @@ sub type_subpart_from_magic {
 
 sub defaultFS() { 'ext4' }
 
-sub true_local_fs_types() { qw(btrfs ext3 ext2 ext4 reiserfs reiser4 xfs jfs) }
+sub true_local_fs_types() { qw(btrfs ext3 ext2 ext4 reiserfs xfs jfs) }
 
 sub isEmpty { !$_[0]{fs_type} && $_[0]{pt_type} == 0 }
 sub isEfi { arch() =~ /ia64/ && $_[0]{pt_type} == 0xef }
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index ccc3f251a..8b469e69a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- partitioning:
+  o drop support for reiser4 (mga#5680)
+
 Version 14.16 - 29 April 2012
 
 - add btrfsck
-- 
cgit v1.2.1