summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-12-01 15:51:54 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-12-01 15:51:54 +0000
commit8606fb5fc4381724ed7d4cafb99c67bd66c0b225 (patch)
treee1857d0cddead45f7f51a2f77f0e48e53ce31052
parentaf5a0f5b9eefe8a5a8ff4697d82ec0613cdd1e6f (diff)
downloaddrakx-8606fb5fc4381724ed7d4cafb99c67bd66c0b225.tar
drakx-8606fb5fc4381724ed7d4cafb99c67bd66c0b225.tar.gz
drakx-8606fb5fc4381724ed7d4cafb99c67bd66c0b225.tar.bz2
drakx-8606fb5fc4381724ed7d4cafb99c67bd66c0b225.tar.xz
drakx-8606fb5fc4381724ed7d4cafb99c67bd66c0b225.zip
show on console #2 when shells are killed
-rw-r--r--mdk-stage1/stage1.c7
-rw-r--r--move/data/devices1
-rw-r--r--move/move.pm1
3 files changed, 8 insertions, 1 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index 70d012d67..fb50748ce 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -629,8 +629,13 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))
stg1_error_message("Fatal error when launching Mandrake Move.");
#endif
- if (shell_pid != 0)
+ if (shell_pid != 0) {
+ int fd;
kill(shell_pid, 9);
+ fd = open("/dev/tty2", O_RDWR);
+ write(fd, "Killed\n", 7);
+ close(fd);
+ }
finish_frontend();
close_log();
diff --git a/move/data/devices b/move/data/devices
index 10cd770c9..d409df63b 100644
--- a/move/data/devices
+++ b/move/data/devices
@@ -1,3 +1,4 @@
/dev/console c 5 1
/dev/tty4 c 4 4
/dev/tty3 c 4 3
+/dev/tty2 c 4 2
diff --git a/move/move.pm b/move/move.pm
index f065e3086..25210ae4f 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -589,6 +589,7 @@ 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 (fork()) {
sleep 1;