summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/XFdrake
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-01-10 00:33:11 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-01-10 00:33:11 +0000
commit1883acd25096f34779cce40ebba76c5860964f0d (patch)
tree8f977a481321620d53a4af0d9e48a1898d481397 /perl-install/standalone/XFdrake
parent1bd398a1b3eae79192e9c0fce06173ec195caf69 (diff)
downloaddrakx-1883acd25096f34779cce40ebba76c5860964f0d.tar
drakx-1883acd25096f34779cce40ebba76c5860964f0d.tar.gz
drakx-1883acd25096f34779cce40ebba76c5860964f0d.tar.bz2
drakx-1883acd25096f34779cce40ebba76c5860964f0d.tar.xz
drakx-1883acd25096f34779cce40ebba76c5860964f0d.zip
use standalone and standalone::pkgs_install
Diffstat (limited to 'perl-install/standalone/XFdrake')
-rwxr-xr-xperl-install/standalone/XFdrake11
1 files changed, 3 insertions, 8 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 88db4c23d..4af9d8aaa 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -20,6 +20,7 @@
use lib qw(/usr/lib/libDrakX);
use interactive;
+use standalone;
use Xconfigurator;
use Xconfig;
use c;
@@ -30,7 +31,6 @@ local $_ = join '', @ARGV;
my $i = {};
-$::isStandalone = 1;
$::force_xf3 = /-xf3/;
$::beginner = /-beginner/;
$::expert = /-expert/;
@@ -42,7 +42,7 @@ $i->{skiptest} = /-skiptest/;
my $in = interactive->vnew('su');
my $f = "/usr/X11R6/lib/X11/Cards";
-if (!-e $f) { $in->suspend; system("urpmi --auto --best-output XFree86 XFree86-75dpi-fonts"); $in->resume; }
+if (! -e $f) standalone::pkgs_install('XFree86', 'XFree86-75dpi-fonts');
-e $f or die "install XFree86 first!\n";
`pidof xfs` > 0 or system("/etc/rc.d/init.d/xfs start");
@@ -52,10 +52,5 @@ system("mount /proc 2>/dev/null"); # ensure /proc is mounted for pci probing
Xconfig::getinfoFromXF86Config($i) if $0 =~ Xdrakres;
Xconfig::getinfo($i);
-Xconfigurator::main('', $i, $in, 0, -e "/etc/pcmcia",
- sub { my ($server, @l) = @_;
- $in->suspend;
- system("urpmi --auto --best-output XFree86-$server " . join(' ', @l));
- $in->resume;
- });
+Xconfigurator::main('', $i, $in, 0, -e "/etc/pcmcia", \&standalone::pkgs_install);
$in->exit(0);