From 743f3306895bfb0da0062f6f1db7031fc2f23de7 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Mon, 5 Jan 2009 16:57:52 +0000
Subject: - ext4dev is now stable and called ext4 in 2.6.28+

---
 perl-install/fs/mount_options.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install/fs/mount_options.pm')

diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm
index 6ac55584a..8d3158d56 100644
--- a/perl-install/fs/mount_options.pm
+++ b/perl-install/fs/mount_options.pm
@@ -32,10 +32,10 @@ sub unpack {
 		  nfs => [ qw(rsize=8192 wsize=8192) ],
 		  smbfs => [ qw(username= password=) ],
 		  davfs2 => [ qw(username= password= uid= gid=) ],
-		  ext4dev => [ qw(extents) ],
+		  ext4 => [ qw(extents) ],
 		  reiserfs => [ 'notail' ],
 		 );
-    push @{$per_fs{$_}}, 'usrquota', 'grpquota' foreach 'ext2', 'ext3', 'ext4dev', 'xfs';
+    push @{$per_fs{$_}}, 'usrquota', 'grpquota' foreach 'ext2', 'ext3', 'ext4', 'xfs';
 
     while (my ($fs, $l) = each %per_fs) {
 	$part->{fs_type} eq $fs || $part->{fs_type} eq 'auto' && member($fs, @auto_fs) or next;
@@ -230,7 +230,7 @@ sub set_default {
 			       'iocharset=' => $opts{iocharset}, 'codepage=' => $opts{codepage},
 			      });
     }
-    if ($part->{fs_type} eq 'ext4dev') {
+    if ($part->{fs_type} =~ /^ext4(dev)?$/) {
 	put_in_hash($options, { extents => 1 });
     }
     if ($part->{fs_type} eq 'ntfs') {
-- 
cgit v1.2.1