summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-31 20:08:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-31 20:08:19 +0000
commit4ed3f9a05762f0c7966ddb4ac5a36aa088f9dd75 (patch)
treefd45e99467cdab2d376df46349b3cd363eac0c98 /perl-install/standalone
parent0db8b27b7d0e1da0e669cc14d219db719cd0afc0 (diff)
downloaddrakx-4ed3f9a05762f0c7966ddb4ac5a36aa088f9dd75.tar
drakx-4ed3f9a05762f0c7966ddb4ac5a36aa088f9dd75.tar.gz
drakx-4ed3f9a05762f0c7966ddb4ac5a36aa088f9dd75.tar.bz2
drakx-4ed3f9a05762f0c7966ddb4ac5a36aa088f9dd75.tar.xz
drakx-4ed3f9a05762f0c7966ddb4ac5a36aa088f9dd75.zip
use configure_chooser when there is an existing configuration
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/XFdrake9
1 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index eca0f6cad..5153b54b9 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -28,7 +28,6 @@ use interactive;
use any;
use c;
-
$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
local $_ = join '', @ARGV;
@@ -58,7 +57,13 @@ begin:
my $rc = do {
if ($configure_this eq 'everything') {
check_XFree($in);
- Xconfig::main::configure_everything($in, Xconfig::default::configure(), $in->do_pkgs, $auto, { allowNVIDIA_rpms => allowNVIDIA_rpms() });
+ my $raw_X = Xconfig::xfree->read;
+
+ if (@{$raw_X->{xfree3}} || @{$raw_X->{xfree4}}) {
+ Xconfig::main::configure_chooser($in, $raw_X, $in->do_pkgs, { allowNVIDIA_rpms => allowNVIDIA_rpms() });
+ } else {
+ Xconfig::main::configure_everything($in, Xconfig::default::configure(), $in->do_pkgs, $auto, { allowNVIDIA_rpms => allowNVIDIA_rpms() });
+ }
} elsif ($configure_this eq 'auto_install') {
Xconfig::main::configure_everything_auto_install(Xconfig::default::configure(), $in->do_pkgs, {}, { allowNVIDIA_rpms => allowNVIDIA_rpms() });
} elsif ($configure_this eq 'monitor') {