summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-05-12 07:04:38 +0000
committerOlivier Blin <oblin@mandriva.org>2005-05-12 07:04:38 +0000
commiteb58e2187ee2897c889e0be00dd42ecd9a8fbda6 (patch)
tree9a6c4adf5fac6801dc9ce58b4414684abfda1c89
parentfb0ffdb1084a72f18e015713f695f090008e43be (diff)
downloaddrakx-backup-do-not-use-eb58e2187ee2897c889e0be00dd42ecd9a8fbda6.tar
drakx-backup-do-not-use-eb58e2187ee2897c889e0be00dd42ecd9a8fbda6.tar.gz
drakx-backup-do-not-use-eb58e2187ee2897c889e0be00dd42ecd9a8fbda6.tar.bz2
drakx-backup-do-not-use-eb58e2187ee2897c889e0be00dd42ecd9a8fbda6.tar.xz
drakx-backup-do-not-use-eb58e2187ee2897c889e0be00dd42ecd9a8fbda6.zip
fix PCMCIA controller reconfiguration (#15742)
-rwxr-xr-xperl-install/standalone/service_harddrake3
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index fedd0fd58..50c0c9e04 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -145,8 +145,7 @@ foreach my $hw_class (@harddrake::data::tree) {
$modules_conf->write;
next;
} elsif ($Ident eq "PCMCIA_CONTROLLER") {
- $ID{none}{driver} = '' if is_empty_hash_ref($added[0]) && @was_removed;
- harddrake::autoconf::pcmcia(first(values(%ID))->{driver});
+ harddrake::autoconf::pcmcia(keys %ID ? first(values(%ID))->{driver} : '');
} elsif ($Ident eq "USB_CONTROLLER") {
modules::load_category($modules_conf, 'bus/usb');
$modules_conf->write;