summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-09-10 15:46:48 +0000
committerOlivier Blin <oblin@mandriva.com>2008-09-10 15:46:48 +0000
commitf9dbde56a2929a3e475466f5c9fbf0610109c1da (patch)
tree50ad55dff9be6bc18c2a092ccb674eba0f433e88
parent8f7dad058c4da0192afa2d199528ba01abe3ebe7 (diff)
downloaddrakx-backup-do-not-use-f9dbde56a2929a3e475466f5c9fbf0610109c1da.tar
drakx-backup-do-not-use-f9dbde56a2929a3e475466f5c9fbf0610109c1da.tar.gz
drakx-backup-do-not-use-f9dbde56a2929a3e475466f5c9fbf0610109c1da.tar.bz2
drakx-backup-do-not-use-f9dbde56a2929a3e475466f5c9fbf0610109c1da.tar.xz
drakx-backup-do-not-use-f9dbde56a2929a3e475466f5c9fbf0610109c1da.zip
behave nicely when a window manager is running (for debugging)
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/finish-install2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 905990cfa..a5b204018 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,8 @@
- drakboot
o fix nolapic/lapic logic due to altered kernel settings
- fix input devices detection in rpmsrate (broken for 3 years, #43721)
+- finish-install:
+ o behave nicely when a window manager is running (for debugging)
Version 11.38 - 8 September 2008
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 662bcc60d..52c37ca54 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -23,7 +23,7 @@ network::network::read_net_conf($net);
$::isWizard = 1;
my $in = 'interactive'->vnew;
-$in->{no_Window_Manager} = 1;
+$in->{no_Window_Manager} = !any::running_window_manager();
sub get_conf {
my ($name) = @_;