From 69506ced2a36f8b6703c1f7518c08a417c542427 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 28 Oct 2009 16:39:29 +0000
Subject: (find_xorg_driver) split it out of switch_x_driver()

---
 perl-install/standalone/service_harddrake | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'perl-install/standalone/service_harddrake')

diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index a3d3f7d15..a53aa9d55 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -75,11 +75,17 @@ sub schedule_warn_about_switch() {
 }
 
 my $lib = arch() =~ /x86_64/ ? "lib64" : "lib";
+
+sub find_xorg_driver {
+    my ($new_driver) = @_;
+    # nvidia driver has special place:
+    -e "/usr/$lib/xorg/modules/drivers/${new_driver}_drv.so"
+      || -e "/usr/$lib/xorg/extra-modules/${new_driver}_drv.so";
+}
+
 sub switch_x_driver {
     my ($old_driver, $new_driver, $reason) = @_;
-    # nvidia driver has special place:
-    if (!-e "/usr/$lib/xorg/modules/drivers/${new_driver}_drv.so"
-          && !-e "/usr/$lib/xorg/extra-modules/${new_driver}_drv.so") {
+    if (!find_xorg_driver($new_driver)) {
         log::explanations("would switch X.org driver from '$old_driver' to '$new_driver' ($reason); but new driver is not installed");
         return;
     }
-- 
cgit v1.2.1