summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-01-15 14:49:56 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-01-15 14:49:56 +0000
commite173c7f036c9af67d9ed7ce206904883982b90a5 (patch)
tree2e4fb365f7dbf9431bceff4ca7ecde0531b008ac /perl-install
parentbefb6e8c429911f6203c51e771cca1470de7e8da (diff)
downloaddrakx-e173c7f036c9af67d9ed7ce206904883982b90a5.tar
drakx-e173c7f036c9af67d9ed7ce206904883982b90a5.tar.gz
drakx-e173c7f036c9af67d9ed7ce206904883982b90a5.tar.bz2
drakx-e173c7f036c9af67d9ed7ce206904883982b90a5.tar.xz
drakx-e173c7f036c9af67d9ed7ce206904883982b90a5.zip
add an option to skip jazz drives detection
Diffstat (limited to 'perl-install')
-rwxr-xr-xperl-install/standalone/harddrake26
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 380ec4825..a8a09bdc8 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -83,6 +83,8 @@ my @menu_items =
callback => sub { $options{PRINTERS_DETECTION} = $check_boxes{PRINTERS_DETECTION}->active } },
{ path => N("/_Options").N("/Autodetect _modems"), type => '<CheckItem>',
callback => sub { $options{MODEMS_DETECTION} = $check_boxes{MODEMS_DETECTION}->active } },
+ { path => N("/_Options").N("/Autodetect _jazz drives"), type => '<CheckItem>',
+ callback => sub { $options{JAZZ_DETECTION} = $check_boxes{JAZZ_DETECTION}->active } },
{ path => N("/_Help"), type => '<Branch>' },
{
path => N("/_Help").N("/_Help..."),
@@ -195,6 +197,7 @@ foreach (@harddrake::data::tree) {
my ($Ident, $title, $icon, $configurator, $detector) = @$_;
next if ref($detector) ne "CODE"; #skip class witouth detector
next if $Ident =~ /(MODEM|PRINTER)/ && $::testing;
+ next if $Ident =~ /JAZZ/ && !$options{JAZZ_DETECTION};
next if $Ident =~ /MODEM/ && !$options{MODEMS_DETECTION};
next if $Ident =~ /PRINTER/ && !$options{PRINTERS_DETECTION};
@@ -251,7 +254,8 @@ $SIG{CHLD} = sub { undef $pid; $statusbar->pop($sig_id) };
$w->{rwindow}->signal_connect(delete_event => \&quit_global);
$w->{rwindow}->set_position('center') unless $::isEmbedded;
-foreach (['PRINTERS_DETECTION', N("/Autodetect printers")], ['MODEMS_DETECTION', N("/Autodetect modems")]) {
+foreach (['PRINTERS_DETECTION', N("/Autodetect printers")], ['MODEMS_DETECTION', N("/Autodetect modems")],
+ ['JAZZ_DETECTION', N("/Autodetect jazz drives")],) {
$check_boxes{$_->[0]} = $factory->get_widget("<main>".N("/Options").$_->[1]);
$options{$_->[0]} = 0 unless defined($options{$_->[0]}); # force detection by default
$check_boxes{$_->[0]}->set_active($options{$_->[0]}); # restore saved values