From d0cf48bf5c629d174a78b68ccd185e149ecf2194 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 29 Mar 2005 15:30:23 +0000 Subject: - 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 --- perl-install/standalone/harddrake2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'perl-install/standalone/harddrake2') diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index b086e1a1e..ef6353d72 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -180,6 +180,7 @@ my %menu_options = ( 'PRINTERS_DETECTION' => [ $menus{options}, N("/Autodetect _printers") ], 'MODEMS_DETECTION' => [ $menus{options}, N("/Autodetect _modems") ], 'JAZZ_DETECTION' => [ $menus{options}, N("/Autodetect _jaz drives") ], + 'PARALLEL_ZIP_DETECTION' => [ $menus{options}, N("/Autodetect parallel _zip drives") ], ); @@ -194,6 +195,8 @@ my @menu_items = sub { $options{MODEMS_DETECTION} = $check_boxes{MODEMS_DETECTION}->get_active }, undef, '' ], [ join('', @{$menu_options{JAZZ_DETECTION}}), undef, sub { $options{JAZZ_DETECTION} = $check_boxes{JAZZ_DETECTION}->get_active }, undef, '' ], + [ join('', @{$menu_options{PARALLEL_ZIP_DETECTION}}), undef, + sub { $options{PARALLEL_ZIP_DETECTION} = $check_boxes{PARALLEL_ZIP_DETECTION}->get_active }, undef, '' ], [ $menus{help}, undef, undef, undef, '' ], if_(-x "/usr/sbin/drakhelp_inst", [ $menus{help} . N("/_Help"), undef, sub { unless (fork()) { exec("drakhelp --id harddrake") } }, undef, '' ], @@ -359,7 +362,7 @@ foreach my $hw_class (@harddrake::data::tree) { next if $Ident =~ /MODEM/ && !$options{MODEMS_DETECTION}; next if $Ident =~ /PRINTER/ && !$options{PRINTERS_DETECTION}; - my @devices = &$detector; + my @devices = $detector->(\%options); next unless @devices; # Skip empty class (no devices) push @classes, [ $Ident, $title, $icon, $configurator, @devices ]; } -- cgit v1.2.1