From 9b69b921952596c8c8f275fcbc010f9e5b3e46cc Mon Sep 17 00:00:00 2001 From: Antoine Ginies Date: Tue, 8 Mar 2011 14:12:46 +0000 Subject: disable ext4 --- perl-install/diskdrake/hd_gtk.pm | 2 +- perl-install/fs/format.pm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index c2bd64023..4e4e21ae1 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -385,7 +385,7 @@ sub hd2kind { } sub filesystems_button_box() { - my @types = (N_("Ext4"), N_("XFS"), N_("Swap"), arch() =~ /sparc/ ? N_("SunOS") : arch() eq "ppc" ? N_("HFS") : N_("Windows"), + my @types = (N_("Ext3"), N_("XFS"), N_("Swap"), arch() =~ /sparc/ ? N_("SunOS") : arch() eq "ppc" ? N_("HFS") : N_("Windows"), N_("Other"), N_("Empty")); my %name2fs_type = (Ext3 => 'ext3', Ext4 => 'ext4', 'XFS' => 'xfs', Swap => 'swap', Other => 'other', "Windows" => 'vfat', HFS => 'hfs'); diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm index 931405eea..ba52a9122 100644 --- a/perl-install/fs/format.pm +++ b/perl-install/fs/format.pm @@ -13,7 +13,7 @@ use log; my %cmds = ( ext2 => [ 'e2fsprogs', 'mkfs.ext2', '-F' ], ext3 => [ 'e2fsprogs', 'mkfs.ext3', '-F' ], - ext4 => [ 'e2fsprogs', 'mkfs.ext4', '-F' ], +# ext4 => [ 'e2fsprogs', 'mkfs.ext4', '-F' ], reiserfs => [ 'reiserfsprogs', 'mkfs.reiserfs', '-ff' ], reiser4 => [ 'reiser4progs', 'mkfs.reiser4', '-f', '-y' ], xfs => [ 'xfsprogs', 'mkfs.xfs', '-f', '-q' ], @@ -31,7 +31,7 @@ my %cmds = ( my %LABELs = ( #- option, length, handled_by_mount ext2 => [ '-L', 16, 1 ], ext3 => [ '-L', 16, 1 ], - ext4 => [ '-L', 16, 1 ], +# ext4 => [ '-L', 16, 1 ], reiserfs => [ '-l', 16, 1 ], reiser4 => [ '-L', 16, 1 ], xfs => [ '-L', 12, 1 ], @@ -51,7 +51,7 @@ my %edit_LABEL = ( # package, command, option # If no option, run