summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-03-01 14:23:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-03-01 14:23:17 +0000
commit946700efd57fe898ccc55e3f5011785ac5ad6b1d (patch)
tree4d2910aa5ffd6f68d5aae683537d01212e6cec46
parentc9f1865568c9d5f4c1696efd30c4b5f6519a4939 (diff)
downloaddrakx-946700efd57fe898ccc55e3f5011785ac5ad6b1d.tar
drakx-946700efd57fe898ccc55e3f5011785ac5ad6b1d.tar.gz
drakx-946700efd57fe898ccc55e3f5011785ac5ad6b1d.tar.bz2
drakx-946700efd57fe898ccc55e3f5011785ac5ad6b1d.tar.xz
drakx-946700efd57fe898ccc55e3f5011785ac5ad6b1d.zip
handle leaving X for both Xdrakres and XFdrake (=> Xdrakres completly obsolete)
-rw-r--r--perl-install/Xconfigurator.pm17
1 files changed, 9 insertions, 8 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 7bd9464a0..c5633c864 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -1582,7 +1582,14 @@ Current configuration is:
}
}
- if ($::isStandalone && $0 =~ /Xdrakres/) {
+ if (!$::isStandalone || $0 !~ /Xdrakres/) {
+ $in->set_help('configureXxdm') unless $::isStandalone;
+ my $run = exists $o->{xdm} ? $o->{xdm} : $::auto || $in->ask_yesorno(_("X at startup"),
+_("I can set up your computer to automatically start X upon booting.
+Would you like X to start when you reboot?"), 1);
+ any::runlevel($prefix, $run ? 5 : 3) unless $::testing;
+ }
+ if ($::isStandalone && $in->isa('interactive_gtk')) {
if (my $wm = any::running_window_manager()) {
if ($in->ask_okcancel('', _("Please relog into %s to activate the changes", ucfirst (lc $wm)), 1)) {
fork and $in->exit;
@@ -1601,13 +1608,7 @@ Current configuration is:
} else {
$in->ask_warn('', _("Please log out and then use Ctrl-Alt-BackSpace"));
}
- } else {
- $in->set_help('configureXxdm') unless $::isStandalone;
- my $run = exists $o->{xdm} ? $o->{xdm} : $::auto || $in->ask_yesorno(_("X at startup"),
-_("I can set up your computer to automatically start X upon booting.
-Would you like X to start when you reboot?"), 1);
- any::runlevel($prefix, $run ? 5 : 3) unless $::testing;
- }
+ }
}
}