summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-12-14 16:42:45 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-12-14 16:42:45 +0000
commitea1c93402dfa2aba19ab3dbc3551cd21572affb9 (patch)
treeec45ca3dd1f9c2899748fabe19ef9f4a2d1ba13d /perl-install/Xconfigurator.pm
parent0f4c7b1bab30307ecee99c03506b0bb632e5c51f (diff)
downloaddrakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.tar
drakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.tar.gz
drakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.tar.bz2
drakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.tar.xz
drakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.zip
no_comment
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm14
1 files changed, 12 insertions, 2 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index e3011e4ab..b34cdeb50 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -777,11 +777,21 @@ sub main {
}
if ($ok) {
- my $run = $o->{xdm} || $::auto || $in->ask_yesorno(_("X at startup"),
+ if ($::isStandalone && !-t STDIN) {
+ if (`pidof kwm` > 0 && $in->ask_okcancel('', _("Please relog into KDE to activate the changes"), 1)) {
+ system("kwmcom logout");
+ exec qw(nohup perl -e), q{
+ for (my $nb = 10; $nb && `pidof kwm` > 0; $nb--) { sleep 1 }
+ system("killall X") unless `pidof kwm` > 0;
+ };
+ }
+ } else {
+ my $run = $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);
- rewriteInittab($run ? 5 : 3) unless $::testing;
+ rewriteInittab($run ? 5 : 3) unless $::testing;
+ }
run_program::rooted($prefix, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/ && !$::isStandalone;
}
}