use standalone and standalone::pkgs_install

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);