From 32a83378c4a49d7b0bf6d574db66b52956a432c3 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 11 Feb 2000 13:11:54 +0000
Subject: no_comment

---
 docs/TODO                                 |  2 ++
 perl-install/ChangeLog                    | 16 ++++++++++++++++
 perl-install/fs.pm                        |  2 +-
 perl-install/install_steps_interactive.pm | 16 ++++++++--------
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/docs/TODO b/docs/TODO
index 453f5c221..bea11c050 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -7,6 +7,8 @@ after clear all and auto allocate, try maximal size available).
 
 
 -to test--------------------------------------------------------------------------------
+what happens if a module fails to insmod (scsi step), in beginner/normal/expert
+
 fstab must be sorted (/usr/local after /usr)
 
 in chooseResolutions: display the graphic card found
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index ea9a033e8..47007a780 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,19 @@
+2000-02-11  Pixel  <pixel@mandrakesoft.com>
+
+	* install_steps_interactive.pm (setup_thiskind): handles the undef
+	value returned by load_thiskind
+
+	* install_steps_interactive.pm (load_thiskind): returns undef if
+	error loading a module
+
+	* fs.pm (format_part): changed the prototype from $;$@ to $;@
+	otherwise, @options always have a value (mostly undef) and mkdosfs
+	fails (with "mkdosfs", "/dev/hdXX", undef, "-F", 32)
+
+	* install_steps_interactive.pm (setup_thiskind):
+	add a $auto_probe_pci that overrules $o->{auto_probe_pci}
+	(that way no pci probe the second time)
+
 2000-02-10  François Pons  <fpons@mandrakesoft.com>
 	* heavy modification of build_archive and extract_archive to manage
 	a TOC directly in archive file, handle bzip2 or gzip compression,
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 390221732..f685c159f 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -73,7 +73,7 @@ sub format_dos($@) {
     run_program::run("mkdosfs", devices::make($dev), @options) or die _("%s formatting of %s failed", "dos", $dev);
 }
 
-sub format_part($;$@) {
+sub format_part($;@) {
     my ($part, @options) = @_;
 
     $part->{isFormatted} and return;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 2cb1e567f..ed1ca1ecc 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1193,19 +1193,19 @@ You may have to restart installation and give ``%s'' at the prompt", $ide));
 	}
     }
 
-    eval { modules::load_thiskind($type, sub { $w = wait_load_module($o, $type, @_) }, $pcmcia) };
-    $@ and $o->errorInStep($@);
+    my @l = eval { modules::load_thiskind($type, sub { $w = wait_load_module($o, $type, @_) }, $pcmcia) };
+    $@ and $o->errorInStep($@), return undef;
+    @l;
 }
 
 #------------------------------------------------------------------------------
 sub setup_thiskind {
-    my ($o, $type, $auto, $at_least_one) = @_;    
+    my ($o, $type, $auto, $at_least_one) = @_;
+
+    # load_thiskind returns undef in case of error
+    my @l = $o->load_thiskind($type) if !$::expert || $o->ask_yesorno('', _("Try to find PCI devices?"), 1);
+    return if defined @l && $auto && (@l || !$at_least_one);
 
-    if (!exists $o->{auto_probe_pci}) {
-	$o->{auto_probe_pci} = !$::expert || $o->ask_yesorno('', _("Try to find PCI devices?"), 1);
-    }
-    my @l = $o->load_thiskind($type) if $o->{auto_probe_pci};
-    return if $auto && (@l || !$at_least_one);
     while (1) {
 	my $msg = @l ?
 	  [ _("Found %s %s interfaces", join(", ", map { $_->[0] } @l), $type),
-- 
cgit v1.2.1