summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-03-15 09:56:29 +0000
committerFrancois Pons <fpons@mandriva.com>2001-03-15 09:56:29 +0000
commitf2c80efd316af9a6a380468ffa3fa506fad2cac3 (patch)
tree36afc5dccd8664793b89d251109600574678d367
parent1493d82086cdcd42c8bbdcc58906cb58985a3b85 (diff)
downloaddrakx-f2c80efd316af9a6a380468ffa3fa506fad2cac3.tar
drakx-f2c80efd316af9a6a380468ffa3fa506fad2cac3.tar.gz
drakx-f2c80efd316af9a6a380468ffa3fa506fad2cac3.tar.bz2
drakx-f2c80efd316af9a6a380468ffa3fa506fad2cac3.tar.xz
drakx-f2c80efd316af9a6a380468ffa3fa506fad2cac3.zip
remove duplicate begin label.
take care of existing configuration.
-rwxr-xr-xperl-install/standalone/XFdrake2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 3e8c6a859..a4b4145e1 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -41,7 +41,6 @@ $::noauto = /-noauto/;
$::testing = /-testing/;
$i->{skiptest} = /-skiptest/;
-begin:
my $in = interactive->vnew('su');
my $f = "/usr/X11R6/lib/X11/Cards";
@@ -56,6 +55,7 @@ Xconfig::getinfoFromXF86Config($i) if $0 =~ Xdrakres;
begin:
Xconfig::getinfo($i);
+Xconfig::getinfoFromXF86Config($i, ''); #- take default from here at least.
$::isEmbedded and kill USR2, $::CCPID;
Xconfigurator::main('', $i, $in, 0, sub { $in->standalone::pkgs_install(@_) });