summaryrefslogtreecommitdiffstats
path: root/perl-install/install_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-30 21:50:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-30 21:50:08 +0000
commit7a9b29dbe29f5c09f3bfff1f36fc469f4256acf2 (patch)
treeb39f9f4f784ebea5ad352fd62c6125480c679bf4 /perl-install/install_interactive.pm
parent5b074d5c8cfd6623a15f29c37e565ce41faa55fc (diff)
downloaddrakx-backup-do-not-use-7a9b29dbe29f5c09f3bfff1f36fc469f4256acf2.tar
drakx-backup-do-not-use-7a9b29dbe29f5c09f3bfff1f36fc469f4256acf2.tar.gz
drakx-backup-do-not-use-7a9b29dbe29f5c09f3bfff1f36fc469f4256acf2.tar.bz2
drakx-backup-do-not-use-7a9b29dbe29f5c09f3bfff1f36fc469f4256acf2.tar.xz
drakx-backup-do-not-use-7a9b29dbe29f5c09f3bfff1f36fc469f4256acf2.zip
no_comment
Diffstat (limited to 'perl-install/install_interactive.pm')
-rw-r--r--perl-install/install_interactive.pm65
1 files changed, 44 insertions, 21 deletions
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index fa02fe13c..fd7e85024 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -17,7 +17,29 @@ use devices;
use modules;
-sub partitionWizard {
+sub partition_with_diskdrake {
+ my ($o, $hds) = @_;
+ my $ok = 1;
+ do {
+ diskdrake::main($hds, $o->{raid}, interactive_gtk->new, $o->{partitions});
+ delete $o->{wizard} and return partitionWizard($o);
+ my @fstab = fsedit::get_fstab(@$hds);
+
+ unless (fsedit::get_root(\@fstab)) {
+ $ok = 0;
+ $o->ask_okcancel('', _("You must have a root partition.
+For this, create a partition (or click on an existing one).
+Then choose action ``Mount point'' and set it to `/'"), 1) or return;
+ }
+ if (!grep { isSwap($_) } @fstab) {
+ $o->ask_warn('', _("You must have a swap partition")), $ok=0 if $::beginner;
+ $ok &&= $::expert || $o->ask_okcancel('', _("You don't have a swap partition\n\nContinue anyway?"));
+ }
+ } until $ok;
+ 1;
+}
+
+sub partitionWizardSolutions {
my ($o, $hds, $fstab, $readonly) = @_;
my @wizlog;
my (@solutions, %solutions);
@@ -120,26 +142,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 {
- my $ok = 1;
- do {
- diskdrake::main($hds, $o->{raid}, interactive_gtk->new, $o->{partitions});
- my @fstab = fsedit::get_fstab(@$hds);
-
- unless (fsedit::get_root(\@fstab)) {
- $ok = 0;
- $o->ask_okcancel('', _("You must have a root partition.
-For this, create a partition (or click on an existing one).
-Then choose action ``Mount point'' and set it to `/'"), 1) or return;
- }
- if (!grep { isSwap($_) } @fstab) {
- $o->ask_warn('', _("You must have a swap partition")), $ok=0 if $::beginner;
- $ok &&= $::expert || $o->ask_okcancel('', _("You don't have a swap partition\n\nContinue anyway?"));
- }
- } until $ok;
- 1;
- } ];
+ $solutions{diskdrake} = [ 0, _("Use diskdrake"), sub { partition_with_diskdrake($o, $hds) } ];
}
$solutions{fdisk} =
@@ -160,6 +163,26 @@ When you are done, don't forget to save using `w'", partition_table_raw::descrip
%solutions;
}
+sub partitionWizard {
+ my ($o) = @_;
+
+ my %solutions = partitionWizardSolutions($o, $o->{hds}, $o->{fstab}, $o->{partitioning}{readonly});
+
+ my @solutions = sort { $b->[0] <=> $a->[0] } values %solutions;
+
+ my $level = $::beginner ? 2 : -9999;
+ my @sol = grep { $_->[0] >= $level } @solutions;
+ @solutions = @sol if @sol > 1;
+
+ my $ok; while (!$ok) {
+ my $sol = $o->ask_from_listf('', _("The DrakX Partitioning wizard found the following solutions:"), sub { $_->[1] }, \@solutions) or redo;
+ eval { $ok = $sol->[2]->() };
+ die if $@ =~ /setstep/;
+ $ok &&= !$@;
+ $@ and $o->ask_warn('', _("Partitioning failed: %s", $@));
+ }
+}
+
#--------------------------------------------------------------------------------
sub wait_load_module {
my ($o, $type, $text, $module) = @_;