diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2005-08-04 07:22:41 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2005-08-04 07:22:41 +0000 |
| commit | a1ef9ff823af45d0815602f54e939a705976555a (patch) | |
| tree | b2debd973e3a47e880b35b65023bed22b10d4beb /perl-install | |
| parent | 3965d905db42cdb9aaeb5b75f71e87d80c424f8d (diff) | |
| download | drakx-a1ef9ff823af45d0815602f54e939a705976555a.tar drakx-a1ef9ff823af45d0815602f54e939a705976555a.tar.gz drakx-a1ef9ff823af45d0815602f54e939a705976555a.tar.bz2 drakx-a1ef9ff823af45d0815602f54e939a705976555a.tar.xz drakx-a1ef9ff823af45d0815602f54e939a705976555a.zip | |
do not offer to configure driver of keyboards and mice (#17254)
Diffstat (limited to 'perl-install')
| -rwxr-xr-x | perl-install/standalone/harddrake2 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 10ca57045..c486e516b 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -332,7 +332,7 @@ $tree->get_selection->signal_connect('changed' => sub { } # if we've valid driver, let's offer to configure it, else hide buttons - show_hide(defined($current_device->{driver}) && $current_device->{driver} !~ /^unknown|^Bad|^Card|^Hsf|^Removable:|\|/, $module_cfg_button); + show_hide(defined($current_device->{driver}) && $current_device->{driver} !~ /^unknown|^Bad|^Card|^Hsf|^kbd|^Mouse:USB|^mouse\d|^Removable:|\|/, $module_cfg_button); $current_configurator = $configurators[$idx]; show_hide($current_configurator && -x first(split /\s+/, $current_configurator), $config_button); # strip arguments for -x test @@ -443,10 +443,9 @@ foreach (@classes) { } sub reap_children() { - undef $pid; # reap zombies my $child_pid; - do { $child_pid = waitpid(-1, POSIX::WNOHANG) } until $child_pid > 0; + do { $child_pid = waitpid(-1, POSIX::WNOHANG); undef $pid if $pid == $child_pid } until $child_pid > 0; }; $SIG{CHLD} = \&reap_children; |