summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-28 21:50:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-28 21:50:42 +0000
commitadad06dd92f56cd6be3ce69a36a5b2819690f111 (patch)
treebe8dd66c11c5aa490bc24b27ce46ccf48b242ee7
parent0c49994dbac6f0ac27a4622849e76be7be7c83e0 (diff)
downloaddrakx-adad06dd92f56cd6be3ce69a36a5b2819690f111.tar
drakx-adad06dd92f56cd6be3ce69a36a5b2819690f111.tar.gz
drakx-adad06dd92f56cd6be3ce69a36a5b2819690f111.tar.bz2
drakx-adad06dd92f56cd6be3ce69a36a5b2819690f111.tar.xz
drakx-adad06dd92f56cd6be3ce69a36a5b2819690f111.zip
(configureX): adapt to new Xconfig
-rw-r--r--perl-install/install_steps_interactive.pm16
1 files changed, 3 insertions, 13 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 8a644ea65..5e12e307b 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1281,22 +1281,12 @@ sub configureX {
my ($o, $clicked) = @_;
$o->configureXBefore;
- #- strange, xfs must not be started twice...
- #- trying to stop and restart it does nothing good too...
- my $xfs_started if 0;
- run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/xfs", "start") unless $::live || $xfs_started;
- $xfs_started = 1;
-
- require Xconfigurator;
- { local $::testing = 0; #- unset testing
- local $::auto = !$::expert && !$clicked;
-
- symlink "$o->{prefix}/etc/gtk", "/etc/gtk";
- Xconfigurator::main($o->{X}, $o, $o->do_pkgs,
+ symlink "$o->{prefix}/etc/gtk", "/etc/gtk";
+ require Xconfig::main;
+ Xconfig::main::configure_everything($o, $o->{raw_X}, $o->do_pkgs, !$::expert && !$clicked,
{ allowFB => $o->{allowFB},
allowNVIDIA_rpms => install_any::allowNVIDIA_rpms($o->{packages}),
});
- }
$o->configureXAfter;
}