- ext4dev is now stable and called ext4 in 2.6.28+

1 files changed, 7 insertions, 7 deletions

diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 1c7bb5c26..386acbad6 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' ],
-    ext4dev     => [ 'e2fsprogs', 'mkfs.ext3', '-F', '-I', '256' ], # FIXME: enable more options once we've better mkfs support
+    ext4     => [ 'e2fsprogs', 'mkfs.ext4', '-F' ], # FIXME: enable more options once we've better mkfs support
     reiserfs => [ 'reiserfsprogs', 'mkfs.reiserfs', '-ff' ],
     reiser4  => [ 'reiser4progs', 'mkfs.reiser4', '-f', '-y' ],
     xfs      => [ 'xfsprogs', 'mkfs.xfs', '-f', '-q' ],
@@ -29,7 +29,7 @@ my %cmds = (
 my %LABELs = ( #- option, length, handled_by_mount
     ext2     => [ '-L', 16, 1 ],
     ext3     => [ '-L', 16, 1 ],
-    ext4dev     => [ '-L', 16, 1 ],
+    ext4     => [ '-L', 16, 1 ],
     reiserfs => [ '-l', 16, 1 ],
     xfs      => [ '-L', 12, 1 ],
     jfs      => [ '-L', 16, 1 ],
@@ -88,7 +88,7 @@ sub part_raw {
 
     my $fs_type = $part->{fs_type};
 
-    if (member($fs_type, qw(ext2 ext3 ext4dev))) {
+    if (member($fs_type, qw(ext2 ext3 ext4))) {
 	push @options, "-m", "0" if $part->{mntpoint} =~ m|^/home|;
     } elsif (isDos($part)) {
 	$fs_type = 'dos';
@@ -96,7 +96,7 @@ sub part_raw {
         push @options, '-l', "Untitled";
     } elsif (isAppleBootstrap($part)) {
 	push @options, '-l', 'bootstrap';
-    } elsif (member($fs_type, 'swap', 'ext2', 'ext3')) {
+    } elsif (member($fs_type, 'swap', 'ext2', 'ext3', 'ext4')) {
 	push @options, '-U', $part->{device_UUID} if $part->{device_UUID};
     }
 
@@ -109,7 +109,7 @@ sub part_raw {
 		$part->{device_LABEL} = $short;
 	    }
 	    delete $part->{prefer_device_LABEL}
-	      if !$handled_by_mount || $part->{mntpoint} eq '/' && !member($fs_type, qw(ext2 ext3 ext4dev));
+	      if !$handled_by_mount || $part->{mntpoint} eq '/' && !member($fs_type, qw(ext2 ext3 ext4));
 
 	    push @options, $option, $part->{device_LABEL};
 	} else {
@@ -129,7 +129,7 @@ sub part_raw {
 	run_program::raw({ timeout => 'never' }, @args) or die N("%s formatting of %s failed", $fs_type, $dev);
     }
 
-    if (member($fs_type, qw(ext3 ext4dev))) {
+    if (member($fs_type, qw(ext3 ext4))) {
 	disable_forced_fsck($dev);
     }
 
@@ -180,7 +180,7 @@ sub formatMount_part {
     }
 
     #- setting user_xattr on /home (or "/" if no /home)
-    if (!$part->{isMounted} && member($part->{fs_type}, qw(ext3 ext4dev))
+    if (!$part->{isMounted} && member($part->{fs_type}, qw(ext3 ext4))
 	  && ($part->{mntpoint} eq '/home' ||
 		!fs::get::has_mntpoint('/home', $all_hds) && $part->{mntpoint} eq '/')) {
 	run_program::run('tune2fs', '-o', 'user_xattr', devices::make($part->{real_device} || $part->{device}));