summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-12-08 15:46:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-12-08 15:46:01 +0000
commit1cde4b2b8ec9b86c6bdfdeca969b521bb4543cb9 (patch)
treed1044fcfdeb1202bfac52b4cbcb5d620413ad5ee
parentcaf582ad5764362b3d349550d6a0c0162dfe05f9 (diff)
downloaddrakx-1cde4b2b8ec9b86c6bdfdeca969b521bb4543cb9.tar
drakx-1cde4b2b8ec9b86c6bdfdeca969b521bb4543cb9.tar.gz
drakx-1cde4b2b8ec9b86c6bdfdeca969b521bb4543cb9.tar.bz2
drakx-1cde4b2b8ec9b86c6bdfdeca969b521bb4543cb9.tar.xz
drakx-1cde4b2b8ec9b86c6bdfdeca969b521bb4543cb9.zip
- tell devfsd to reload so that /etc/devfsd/conf.d/mouse.conf is used and /dev/mouse created
- try to have less symlinks
-rw-r--r--move/move.pm5
1 files changed, 4 insertions, 1 deletions
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");
}