diff options
| -rw-r--r-- | perl-install/NEWS | 4 | ||||
| -rw-r--r-- | perl-install/diskdrake/hd_gtk.pm | 4 | ||||
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 8 | ||||
| -rw-r--r-- | perl-install/fs/format.pm | 14 | ||||
| -rw-r--r-- | perl-install/fs/mount.pm | 4 | ||||
| -rw-r--r-- | perl-install/fs/mount_options.pm | 6 | ||||
| -rw-r--r-- | perl-install/fs/type.pm | 4 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
8 files changed, 26 insertions, 20 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index f27a60b99..7338066d3 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,7 @@ + +- diskdrake: + o ext4dev is now stable and called ext4 in 2.6.28+ + Version 11.76 - 18 December 2008 - diskdrake: diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index a6a904589..0aac21bbc 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -339,7 +339,7 @@ sub create_buttons4partitions { last; } }); - my @colorized_fs_types = qw(ext3 ext4dev xfs swap vfat ntfs ntfs-3g); + my @colorized_fs_types = qw(ext3 ext4 xfs swap vfat ntfs ntfs-3g); $w->set_name("PART_" . (isEmpty($entry) ? 'empty' : $entry->{fs_type} && member($entry->{fs_type}, @colorized_fs_types) ? $entry->{fs_type} : 'other')); @@ -378,7 +378,7 @@ sub hd2kind { sub filesystems_button_box() { 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 => 'ext4dev', 'XFS' => 'xfs', Swap => 'swap', Other => 'other', "Windows" => 'vfat', HFS => 'hfs'); + my %name2fs_type = (Ext3 => 'ext3', Ext4 => 'ext4', 'XFS' => 'xfs', Swap => 'swap', Other => 'other', "Windows" => 'vfat', HFS => 'hfs'); gtkpack(Gtk2::HBox->new(), map { diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 9c2c6750c..6d40c2f0d 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -417,7 +417,7 @@ sub part_possible_actions { my %macros = ( readonly => '$hd->{readonly}', hasMntpoint => '$part->{mntpoint}', - LVM_resizable => '$part->{fs_type} eq "reiserfs" || (isMounted ? $part->{fs_type} eq "xfs" : member($part->{fs_type}, qw(ext3 ext4dev)))', + LVM_resizable => '$part->{fs_type} eq "reiserfs" || (isMounted ? $part->{fs_type} eq "xfs" : member($part->{fs_type}, qw(ext3 ext4)))', canModifyRAID => 'isPartOfRAID($part) && !isMounted(fs::get::device2part($part->{raid}, $all_hds->{raids}))', ); if (isEmpty($part)) { @@ -564,7 +564,7 @@ sub Type { my @types = fs::type::type_names($::expert, $hd); #- when readonly, Type() is allowed only when changing {fs_type} but not {pt_type} - #- eg: switching between ext2, ext3, ext4dev, reiserfs... + #- eg: switching between ext2, ext3, ext4, reiserfs... @types = grep { fs::type::type_name2pt_type($_) == $part->{pt_type} } @types if $hd->{readonly}; my $type_name = fs::type::part2type_name($part); @@ -576,7 +576,7 @@ sub Type { my $type = $type_name && fs::type::type_name2subpart($type_name); - if (member($type->{fs_type}, qw(ext2 ext3 ext4dev))) { + if (member($type->{fs_type}, qw(ext2 ext3 ext4))) { my $_w = $in->wait_message(N("Please wait"), N("Switching from %s to %s", 'ext2', $type->{fs_type})); if (run_program::run("tune2fs", "-j", devices::make($part->{device}))) { put_in_hash($part, $type); @@ -687,7 +687,7 @@ sub Resize { $nice_resize{fat} = resize_fat::main->new($part->{device}, devices::make($part->{device})); $min = max($min, $nice_resize{fat}->min_size); $max = min($max, $nice_resize{fat}->max_size); - } elsif (member($part->{fs_type}, qw(ext2 ext3 ext4dev))) { + } elsif (member($part->{fs_type}, qw(ext2 ext3 ext4))) { write_partitions($in, $hd) or return; require diskdrake::resize_ext2; if ($nice_resize{ext2} = diskdrake::resize_ext2->new($part->{device}, devices::make($part->{device}))) { 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})); diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm index 6dc312049..2ea0cdc7f 100644 --- a/perl-install/fs/mount.pm +++ b/perl-install/fs/mount.pm @@ -35,7 +35,7 @@ sub mount { $fs or log::l("not mounting $dev partition"), return; { - my @fs_modules = qw(ext3 ext4dev hfs jfs nfs ntfs romfs reiserfs ufs xfs vfat); + my @fs_modules = qw(ext3 ext4 hfs jfs nfs ntfs romfs reiserfs ufs xfs vfat); my @types = (qw(ext2 proc sysfs usbfs usbdevfs iso9660 devfs devpts auto ntfs-3g), @fs_modules); push @types, 'smb', 'smbfs', 'davfs2' if !$::isInstall; @@ -172,7 +172,7 @@ sub part { } mount($dev, $mntpoint, $fs_type, $b_rdonly, $options, $o_wait_message); - if ($options =~ /usrquota|grpquota/ && member($part->{fs_type}, qw(ext3 ext4dev))) { + if ($options =~ /usrquota|grpquota/ && member($part->{fs_type}, qw(ext3 ext4))) { if (! find { -e "$mntpoint/$_" } qw(aquota.user aquota.group quota.user quota.group)) { #- quotacheck will create aquota.user and/or aquota.group, #- needed for quotas on ext3/ext4. 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') { diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm index ee5769111..e59ca28bb 100644 --- a/perl-install/fs/type.pm +++ b/perl-install/fs/type.pm @@ -22,6 +22,7 @@ my (%type_name2pt_type, %type_name2fs_type, %fs_type2pt_type, %pt_type2fs_type, 0x82 => 'swap', 'Linux swap', 0x83 => 'ext2', 'Linux native', 0x83 => 'ext3', 'Journalised FS: ext3', + 0x83 => 'ext4', 'Journalised FS: ext4', 0x83 => 'reiserfs', 'Journalised FS: ReiserFS', if_(arch() =~ /ppc|i.86|ia64|x86_64/, 0x83 => 'xfs', 'Journalised FS: XFS', @@ -120,7 +121,6 @@ if_(arch() !~ /ppc/, 0x81 => '', 'Minix / old Linux', if_(!$::isInstall, 0x83 => 'reiser4', 'Journalised FS: Reiser4', - 0x83 => 'ext4dev', 'Journalised FS: ext4', ), 0x84 => '', 'OS/2 hidden C: drive', 0x86 => '', 'NTFS volume set (0x86)', @@ -308,7 +308,7 @@ sub type_subpart_from_magic { $p; } -sub true_local_fs_types() { qw(ext3 ext2 ext4dev reiserfs reiser4 xfs jfs) } +sub true_local_fs_types() { qw(ext3 ext2 ext4 reiserfs reiser4 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 3caf76c03..c148ecba8 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- propose ext4 filesystem during install now that it is stable + Version 11.76 - 18 December 2008 - partitionning: |