summaryrefslogtreecommitdiffstats
path: root/perl-install/install_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-12-09 20:14:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-12-09 20:14:31 +0000
commite696409f531a91c512a4c2768accccb58ec9f278 (patch)
treed183875dd9be74b7d0f1b4363d0520ebdb8ef8d4 /perl-install/install_interactive.pm
parent4a96a57480abda1195b8b67ad1a8175e7bc8ba13 (diff)
downloaddrakx-e696409f531a91c512a4c2768accccb58ec9f278.tar
drakx-e696409f531a91c512a4c2768accccb58ec9f278.tar.gz
drakx-e696409f531a91c512a4c2768accccb58ec9f278.tar.bz2
drakx-e696409f531a91c512a4c2768accccb58ec9f278.tar.xz
drakx-e696409f531a91c512a4c2768accccb58ec9f278.zip
- handle more locally "Reload partition table" (esp. without using setstep)
=> no exception is called through gtk
Diffstat (limited to 'perl-install/install_interactive.pm')
-rw-r--r--perl-install/install_interactive.pm13
1 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index ab565eef8..f9db4f6c1 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -8,6 +8,7 @@ use partition_table qw(:types);
use partition_table::raw;
use detect_devices;
use install_steps;
+use install_any;
use devices;
use fsedit;
use log;
@@ -40,10 +41,15 @@ sub partition_with_diskdrake {
$o->set_help('partition_with_diskdrake');
do {
$ok = 1;
+ my $do_force_reload = sub {
+ $o->{all_hds} = fsedit::empty_all_hds();
+ install_any::getHds($o, $o);
+ $o->{all_hds};
+ };
require diskdrake::interactive;
{
local $::expert = $::expert;
- diskdrake::interactive::main($o, $all_hds, $nowizard);
+ diskdrake::interactive::main($o, $all_hds, $nowizard, $do_force_reload);
}
if (delete $o->{wizard}) {
partitionWizard($o, 'nodiskdrake') or redo;
@@ -246,13 +252,12 @@ sub partitionWizard {
if (my $sol = $o->ask_from_listf('', N("The DrakX Partitioning wizard found the following solutions:"), sub { $_[0][1] }, \@solutions)) {
log::l("partitionWizard calling solution $sol->[1]");
my $ok = eval { $sol->[2]->() };
- die if $@ =~ /setstep/;
$@ and $o->ask_warn('', N("Partitioning failed: %s", $@));
$ok or goto &partitionWizard;
+ 1;
} else {
- $nodiskdrake ? return : die "setstep setupSCSI\n";
+ 0;
}
- 1;
}
sub upNetwork {