diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-08-05 14:29:16 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-08-05 14:29:16 +0000 |
| commit | 31de738c99ce16ee26595d7bf2d6e9500a5a10b1 (patch) | |
| tree | 30cb27258fcac641440869517e35e28f29177eb1 /perl-install/standalone/XFdrake | |
| parent | f093421759947c0e1020139c8b0bdb057105c074 (diff) | |
| download | drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.gz drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.bz2 drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.xz drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.zip | |
no_comment
Diffstat (limited to 'perl-install/standalone/XFdrake')
| -rwxr-xr-x | perl-install/standalone/XFdrake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index 588925be6..072f770a1 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -28,14 +28,16 @@ local $_ = join '', @ARGV; /-h/ and die "usage: XFdrake [--xf3] [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n"; +my $i = {}; + +$::isStandalone = 1; $::force_xf3 = /-xf3/; $::beginner = /-beginner/; $::expert = /-expert/; $::auto = /-auto/; $::noauto = /-noauto/; -$::skiptest = /-skiptest/; $::testing = /-testing/; -$::isStandalone = 1; +$i->{skiptest} = /-skiptest/; my $f = "/usr/X11R6/lib/X11/Cards"; -e $f or system("urpmi --auto XFree86 XFree86-75dpi-fonts"); @@ -47,7 +49,7 @@ my $in = vnew interactive('su'); system("mount /proc 2>/dev/null"); # ensure /proc is mounted for pci probing -my $i = $0 =~ Xdrakres ? Xconfig::getinfoFromXF86Config() : {}; +Xconfig::getinfoFromXF86Config($i) if $0 =~ Xdrakres; Xconfig::getinfo($i); Xconfigurator::main('', $i, $in, 0, -e "/etc/pcmcia", sub { system("urpmi --auto XFree86-$_[0]") }); |