summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-12-03 13:56:28 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-12-03 13:56:28 +0000
commite87e3f7b9bb17eeecd95b68cd074d6fe9153f0dd (patch)
tree351725e8fb70b4a86a341c16f328dc2f841b4f9c
parentecc1d837145db1e68222a3ef912c7f9a5a3538a9 (diff)
downloaddrakx-e87e3f7b9bb17eeecd95b68cd074d6fe9153f0dd.tar
drakx-e87e3f7b9bb17eeecd95b68cd074d6fe9153f0dd.tar.gz
drakx-e87e3f7b9bb17eeecd95b68cd074d6fe9153f0dd.tar.bz2
drakx-e87e3f7b9bb17eeecd95b68cd074d6fe9153f0dd.tar.xz
drakx-e87e3f7b9bb17eeecd95b68cd074d6fe9153f0dd.zip
allow easier debugging by not killing shell on #2 when starting with "shell" commandline param
-rw-r--r--move/move.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/move/move.pm b/move/move.pm
index 76ce89873..f105c8fe8 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -613,8 +613,10 @@ sub install2::startMove {
}
#- password in screensaver doesn't make sense if we keep the shell
- kill 9, cat_('/var/run/drakx_shell.pid');
- output('/dev/tty2', "Killed\n");
+ if (cat_('/proc/cmdline') !~ /\bshell\b/) {
+ kill 9, cat_('/var/run/drakx_shell.pid');
+ output('/dev/tty2', "Killed\n");
+ }
if (fork()) {
sleep 1;