summaryrefslogtreecommitdiffstats
path: root/lib/Xconfig/proprietary.pm
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mageia.org>2012-04-05 02:49:52 +0000
committerAnssi Hannula <anssi@mageia.org>2012-04-05 02:49:52 +0000
commitfabeb39b5ef13fd2d4796cc5072b009295c2d430 (patch)
tree68368a3471c2d57b585d076207ab66bca6a2ecfc /lib/Xconfig/proprietary.pm
parentae005c070f2232f77d5ae70f9b1c5160a855b75f (diff)
downloaddrakx-kbd-mouse-x11-fabeb39b5ef13fd2d4796cc5072b009295c2d430.tar
drakx-kbd-mouse-x11-fabeb39b5ef13fd2d4796cc5072b009295c2d430.tar.gz
drakx-kbd-mouse-x11-fabeb39b5ef13fd2d4796cc5072b009295c2d430.tar.bz2
drakx-kbd-mouse-x11-fabeb39b5ef13fd2d4796cc5072b009295c2d430.tar.xz
drakx-kbd-mouse-x11-fabeb39b5ef13fd2d4796cc5072b009295c2d430.zip
Fix firmware handling (it is DRIVER which needs it, not DRIVER2)
Diffstat (limited to 'lib/Xconfig/proprietary.pm')
-rw-r--r--lib/Xconfig/proprietary.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Xconfig/proprietary.pm b/lib/Xconfig/proprietary.pm
index f4fb0c4..7b40a6b 100644
--- a/lib/Xconfig/proprietary.pm
+++ b/lib/Xconfig/proprietary.pm
@@ -53,12 +53,12 @@ sub handle_FIRMWARE {
my $pkg = $card->{FIRMWARE} or return;
$do_pkgs->is_installed($pkg) || $do_pkgs->install($pkg) and return;
+ if ($card->{DRIVER_NO_FIRMWARE}) {
+ log::l("$card->{Driver} need a firmware to work, switching back to $card->{DRIVER_NO_FIRMWARE}");
+ $card->{Driver} = $card->{DRIVER_NO_FIRMWARE};
- if ($card->{DRIVER2_NO_FIRMWARE}) {
- log::l("$card->{Driver2} need a firmware to work, switching back to $card->{DRIVER2_NO_FIRMWARE}");
- $card->{Driver2} = $card->{DRIVER2_NO_FIRMWARE};
} else {
- log::l("$card->{Driver2} needs a firmware to work smoothly/better (eg: 3D, KMS) but will still work");
+ log::l("$card->{Driver} needs a firmware to work smoothly/better (eg: 3D, KMS) but will still work");
}
}