- disable imm/ppa probe during install since it causes some rubbish to be printed (bugzilla #12560)

- add an option in harddrake to probe imm/ppa

1 files changed, 11 insertions, 1 deletions

diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 4f4d3b3f2..eb1203ca5 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -122,7 +122,6 @@ sub load_category {
 
     my @try_modules = (
       if_($category =~ /scsi/,
-	  if_(arch() !~ /ppc/, 'parport_pc', 'imm', 'ppa'),
 	  if_(detect_devices::usbStorage(), 'usb-storage'),
       ),
       arch() =~ /ppc/ ? (
@@ -145,6 +144,17 @@ sub load_category {
       map { { driver => $_, description => $_, try => 1 } } @try_modules;
 }
 
+sub load_parallel_zip {
+    my ($conf) = @_;
+
+    arch() !~ /ppc/ or return;
+
+    eval { modules::load('parport_pc') };
+    grep { 
+	eval { modules::load_and_configure($conf, $_); 1 };
+    } 'imm', 'ppa';
+}
+
 sub probe_category {
     my ($category) = @_;