summaryrefslogtreecommitdiffstats
path: root/perl-install/diskdrake
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-02-17 10:19:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-02-17 10:19:52 +0000
commit9aff1ba4a64432cae2b99b142ac687972f7f7844 (patch)
tree99d29221d3932eff2d688224e4358495cd5460bf /perl-install/diskdrake
parentbb819c17c8da11f0c64d460f4b57b3b6bd01254a (diff)
downloaddrakx-9aff1ba4a64432cae2b99b142ac687972f7f7844.tar
drakx-9aff1ba4a64432cae2b99b142ac687972f7f7844.tar.gz
drakx-9aff1ba4a64432cae2b99b142ac687972f7f7844.tar.bz2
drakx-9aff1ba4a64432cae2b99b142ac687972f7f7844.tar.xz
drakx-9aff1ba4a64432cae2b99b142ac687972f7f7844.zip
in case someone use diskdrake only to create partitions, shut up the predefined mount point automatic choice
Diffstat (limited to 'perl-install/diskdrake')
-rw-r--r--perl-install/diskdrake/interactive.pm10
1 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index d58dd99e8..a0cdb98a1 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -469,12 +469,19 @@ sub part_possible_actions {
}
}
+#- in case someone use diskdrake only to create partitions,
+#- ie without assigning a mount point,
+#- do not suggest mount points anymore
+my $do_suggest_mount_point = 1;
+
sub Create {
my ($in, $hd, $part, $all_hds) = @_;
my ($def_start, $def_size, $max) = ($part->{start}, $part->{size}, $part->{start} + $part->{size});
$part->{maxsize} = $part->{size}; $part->{size} = 0;
- if (!fsedit::suggest_part($part, $all_hds)) {
+ if (fsedit::suggest_part($part, $all_hds)) {
+ $part->{mntpoint} = '' if !$do_suggest_mount_point;
+ } else {
$part->{size} = $part->{maxsize};
fs::type::suggest_fs_type($part, 'ext3');
}
@@ -516,6 +523,7 @@ sub Create {
}, complete => sub {
$part->{size} = from_Mb($mb_size, min_partition_size($hd), $max - $part->{start}); #- need this to be able to get back the approximation of using MB
put_in_hash($part, fs::type::type_name2subpart($type_name));
+ $do_suggest_mount_point = 0 if !$part->{mntpoint};
$part->{mntpoint} = '' if isNonMountable($part);
$part->{mntpoint} = 'swap' if isSwap($part);
fs::mount_options::set_default($part, ignore_is_removable => 1);