summaryrefslogtreecommitdiffstats
path: root/perl-install/install_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-04 13:48:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-04 13:48:26 +0000
commit29958ca6b88d9aa9c9305a18256f8c7092114cde (patch)
treebb59dddb36082c8d629726d42911e76056fc2c85 /perl-install/install_interactive.pm
parentb9cbb41ade40d03aa9aa970e5dadb76a816f38e7 (diff)
downloaddrakx-29958ca6b88d9aa9c9305a18256f8c7092114cde.tar
drakx-29958ca6b88d9aa9c9305a18256f8c7092114cde.tar.gz
drakx-29958ca6b88d9aa9c9305a18256f8c7092114cde.tar.bz2
drakx-29958ca6b88d9aa9c9305a18256f8c7092114cde.tar.xz
drakx-29958ca6b88d9aa9c9305a18256f8c7092114cde.zip
no_comment
Diffstat (limited to 'perl-install/install_interactive.pm')
-rw-r--r--perl-install/install_interactive.pm11
1 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index d27fdd1f4..8d40e3f49 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -18,11 +18,11 @@ use modules;
sub partition_with_diskdrake {
- my ($o, $hds) = @_;
+ my ($o, $hds, $nowizard) = @_;
my $ok = 1;
do {
- diskdrake::main($hds, $o->{raid}, interactive_gtk->new, $o->{partitions});
- delete $o->{wizard} and return partitionWizard($o);
+ diskdrake::main($hds, $o->{raid}, interactive_gtk->new, $o->{partitions}, $nowizard);
+ delete $o->{wizard} and return partitionWizard($o, 'nodiskdrake');
my @fstab = fsedit::get_fstab(@$hds);
unless (fsedit::get_root(\@fstab)) {
@@ -146,7 +146,7 @@ When sure, press Ok.")) or return;
}
if (!$readonly && ref($o) =~ /gtk/) { #- diskdrake only available in gtk for now
- $solutions{diskdrake} = [ 0, _("Use diskdrake"), sub { partition_with_diskdrake($o, $hds) } ];
+ $solutions{diskdrake} = [ 0, _("Use diskdrake"), sub { partition_with_diskdrake($o, $hds, 'nowizard') } ];
}
$solutions{fdisk} =
@@ -168,9 +168,10 @@ When you are done, don't forget to save using `w'", partition_table_raw::descrip
}
sub partitionWizard {
- my ($o) = @_;
+ my ($o, $nodiskdrake) = @_;
my %solutions = partitionWizardSolutions($o, $o->{hds}, $o->{fstab}, $o->{partitioning}{readonly});
+ delete $solutions{diskdrake} if $nodiskdrake;
my @solutions = sort { $b->[0] <=> $a->[0] } values %solutions;