diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-03-28 14:19:05 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-03-28 14:19:05 +0000 |
| commit | 6b8801f914e374526c14a0c580439a876d95f879 (patch) | |
| tree | 4e6f1afb887ef956071a119cd08ef54f1cde8e6e /perl-install/standalone/XFdrake | |
| parent | a106f867e163279d4b5564be72bea3427c37345c (diff) | |
| download | drakx-backup-do-not-use-6b8801f914e374526c14a0c580439a876d95f879.tar drakx-backup-do-not-use-6b8801f914e374526c14a0c580439a876d95f879.tar.gz drakx-backup-do-not-use-6b8801f914e374526c14a0c580439a876d95f879.tar.bz2 drakx-backup-do-not-use-6b8801f914e374526c14a0c580439a876d95f879.tar.xz drakx-backup-do-not-use-6b8801f914e374526c14a0c580439a876d95f879.zip | |
fixed for standalone XFdrake and mousedrake (multi-mouse and
correct probe (USB)).
Diffstat (limited to 'perl-install/standalone/XFdrake')
| -rwxr-xr-x | perl-install/standalone/XFdrake | 7 |
1 files changed, 4 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(@_) }); |