summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-02-18 17:31:25 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-02-18 17:31:25 +0000
commitaa6398654727a7ebc408f50520fe6ae3266ae27b (patch)
tree28d937fd5318f77d9572e13592fcb2d171891ae4
parentf8f6fd8b8fff8d60a8f667daa4d1b8a70eb930c4 (diff)
downloaddrakx-backup-do-not-use-aa6398654727a7ebc408f50520fe6ae3266ae27b.tar
drakx-backup-do-not-use-aa6398654727a7ebc408f50520fe6ae3266ae27b.tar.gz
drakx-backup-do-not-use-aa6398654727a7ebc408f50520fe6ae3266ae27b.tar.bz2
drakx-backup-do-not-use-aa6398654727a7ebc408f50520fe6ae3266ae27b.tar.xz
drakx-backup-do-not-use-aa6398654727a7ebc408f50520fe6ae3266ae27b.zip
don't reboot if the window manager did not exit
-rw-r--r--perl-install/diskdrake/interactive.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index ad252332f..b5faef5cb 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -1295,7 +1295,7 @@ sub tell_wm_and_reboot() {
my ($wm, $pid) = @ARGV;
my $nb;
for ($nb = 20; $nb && -e "/proc/$pid"; $nb--) { sleep 1 }
- exec 'reboot';
+ exec 'reboot' if $nb;
), $wm, $pid;
}
}