fixed for standalone XFdrake and mousedrake (multi-mouse and

correct probe (USB)).

2 files changed, 7 insertions, 3 deletions

diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index a4b4145e1..34d5f742b 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -21,6 +21,7 @@ use lib qw(/usr/lib/libDrakX);
 
 use interactive;
 use standalone;
+use modules;
 use Xconfigurator;
 use Xconfig;
 use c;
@@ -43,6 +44,8 @@ $i->{skiptest} = /-skiptest/;
 
 my $in = interactive->vnew('su');
 
+-r '/etc/modules.conf' and modules::mergein_conf('/etc/modules.conf');
+
 my $f = "/usr/X11R6/lib/X11/Cards";
 $in->standalone::pkgs_install('XFree86', 'XFree86-75dpi-fonts') if (! -e $f);
 -e $f or die "install XFree86 first!\n";
@@ -51,11 +54,9 @@ $in->standalone::pkgs_install('XFree86', 'XFree86-75dpi-fonts') if (! -e $f);
 
 system("mount /proc 2>/dev/null"); # ensure /proc is mounted for pci probing
 
-Xconfig::getinfoFromXF86Config($i) if $0 =~ Xdrakres;
-
 begin:
 Xconfig::getinfo($i);
-Xconfig::getinfoFromXF86Config($i, ''); #- take default from here at least.
+Xconfig::getinfoFromXF86Config($i); #- take default from here at least.
 
 $::isEmbedded and kill USR2, $::CCPID;
 Xconfigurator::main('', $i, $in, 0, sub { $in->standalone::pkgs_install(@_) });
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index 62af16ded..2c6acde75 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -5,6 +5,7 @@ use lib qw(/usr/lib/libDrakX);
 use common qw(:common :system);
 use interactive;
 use standalone;
+use modules;
 use detect_devices;
 use mouse;
 use c;
@@ -19,6 +20,8 @@ $::testing = /-testing/;
 
 my $in = vnew interactive('su');
 
+-r '/etc/modules.conf' and modules::mergein_conf('/etc/modules.conf');
+
 begin:
 my ($mouse) = mouse::detect() unless $::noauto;