diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-01-05 16:57:52 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-01-05 16:57:52 +0000 |
| commit | 743f3306895bfb0da0062f6f1db7031fc2f23de7 (patch) | |
| tree | cd94e3589645010c8fd2d7c3928cf3ca5c4a16a7 /perl-install/diskdrake | |
| parent | 74076cc2c94e5bf7fea146b4a7ac2e09169d7d0b (diff) | |
| download | drakx-backup-do-not-use-743f3306895bfb0da0062f6f1db7031fc2f23de7.tar drakx-backup-do-not-use-743f3306895bfb0da0062f6f1db7031fc2f23de7.tar.gz drakx-backup-do-not-use-743f3306895bfb0da0062f6f1db7031fc2f23de7.tar.bz2 drakx-backup-do-not-use-743f3306895bfb0da0062f6f1db7031fc2f23de7.tar.xz drakx-backup-do-not-use-743f3306895bfb0da0062f6f1db7031fc2f23de7.zip | |
- ext4dev is now stable and called ext4 in 2.6.28+
Diffstat (limited to 'perl-install/diskdrake')
| -rw-r--r-- | perl-install/diskdrake/hd_gtk.pm | 4 | ||||
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 8 |
2 files changed, 6 insertions, 6 deletions
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}))) { |