From 1cde4b2b8ec9b86c6bdfdeca969b521bb4543cb9 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 8 Dec 2003 15:46:01 +0000
Subject: - tell devfsd to reload so that /etc/devfsd/conf.d/mouse.conf is used
 and /dev/mouse created - try to have less symlinks

---
 move/move.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/move/move.pm b/move/move.pm
index 77f544786..05ab1516f 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -180,6 +180,9 @@ sub init {
     if (-f '/etc/X11/X') {
         print "using existing host configuration\n";
         $using_existing_host_config = 1;
+
+	#- so that /etc/devfsd/conf.d/mouse.conf is used and /dev/mouse created
+	run_program::run('/sbin/service', 'devfsd', 'reload');
     }
     if (-s '/etc/sysconfig/i18n') {
         lang::set($o->{locale} = lang::read('', 0)); #- read ~/.i18n first if it exists
@@ -692,7 +695,7 @@ sub automatic_xconf {
 	lomount_clp('nvidia', '/usr/lib/libGLcore.so.1');
     }
     my $lib = 'libGL.so.1';
-    symlinkf("/usr/lib/$lib.$Driver", "/etc/X11/$lib") if -e "/usr/lib/$lib.$Driver";
+    symlinkf_short(-e "/usr/lib/$lib.$Driver" ? "/usr/lib/$lib.$Driver" : "/usr/X11R6/lib/$lib", "/etc/X11/$lib");
 }
 
 
-- 
cgit v1.2.1