From 56b573476e2ea63a509ab2f8ec0683397ae7c85e Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 8 Aug 2007 10:42:16 +0000 Subject: - diskdrake: o do not show partition types which have no associated filesystem for LVM LV (#32326) nb: we still would need to have pt_type per partition_table types --- perl-install/diskdrake/interactive.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'perl-install/diskdrake') diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 6307a3bc5..acca8f01e 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -497,7 +497,7 @@ sub Create { ), { label => N("Size in MB: "), val => \$mb_size, min => to_Mb(min_partition_size($hd)), max => to_Mb($def_size), type => 'range', SpinButton => $::expert, changed => sub { $part->{start} = min($part->{start}, $max - $mb_size * 2048) } }, - { label => N("Filesystem type: "), val => \$type_name, list => [ fs::type::type_names($::expert) ], + { label => N("Filesystem type: "), val => \$type_name, list => [ fs::type::type_names($::expert, $hd) ], sort => 0, if_($::expert, gtk => { wrap_width => 4 }) }, { label => N("Mount point: "), val => \$part->{mntpoint}, list => [ fsedit::suggestions_mntpoint($all_hds), '' ], disabled => sub { my $p = fs::type::type_name2subpart($type_name); isSwap($p) || isNonMountable($p) }, type => 'combo', not_edit => 0, @@ -584,7 +584,7 @@ sub Type { #- for ext2, warn after choosing as ext2->ext3 can be achieved without loosing any data :) $part->{fs_type} eq 'ext2' || $part->{fs_type} =~ /ntfs/ or $warn->() or return; - my @types = fs::type::type_names($::expert); + 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, reiserfs... @@ -927,7 +927,7 @@ sub Loopback { $in->ask_from(N("Loopback"), '', [ { label => N("Loopback file name: "), val => \$part->{loopback_file} }, { label => N("Size in MB: "), val => \$mb_size, min => to_Mb($min), max => to_Mb($max), type => 'range', SpinButton => $::expert }, - { label => N("Filesystem type: "), val => \$type_name, list => [ fs::type::type_names($::expert) ], not_edit => !$::expert, sort => 0 }, + { label => N("Filesystem type: "), val => \$type_name, list => [ fs::type::type_names($::expert, $hd) ], not_edit => !$::expert, sort => 0 }, ], complete => sub { $part->{loopback_file} or $in->ask_warn(N("Give a file name"), N("Give a file name")), return 1, 0; -- cgit v1.2.1