diff options
-rw-r--r-- | mdk-stage1/init.c | 13 | ||||
-rw-r--r-- | mdk-stage1/stage1.c | 8 |
2 files changed, 7 insertions, 14 deletions
diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index fc48c68f2..2ea86be09 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -116,8 +116,6 @@ void doklog() return; } - printf("kernel logging process forked.\n"); - close(0); close(1); close(2); @@ -332,15 +330,11 @@ int main(int argc, char **argv) printf("*** TESTING MODE ***\n"); - printf("\n--- Hi. " DISTRIB_NAME " install initializer starting. ---\n"); - printf("VERSION: %s\n", VERSION); - + printf("\n\t\t\tWelcome to Linux \033[1;36mMandrake\033[0;39m\n\n"); if (!testing) { - printf("mounting /proc filesystem... "); if (mount("/proc", "/proc", "proc", 0, NULL)) fatal_error("Unable to mount proc filesystem"); - printf("done\n"); } @@ -388,8 +382,8 @@ int main(int argc, char **argv) 2) we receive a SIGHUP */ - printf("Remember what Warly said: drink an egg white each morning builds a man!\n"); - printf("running stage1...\n"); + printf("Traktopel says: drink an egg white each morning builds a man! (c) Warly\n"); + printf("Running install...\n"); if (!(installpid = fork())) { /* child */ @@ -397,7 +391,6 @@ int main(int argc, char **argv) child_argv[0] = "/sbin/stage1"; child_argv[1] = NULL; - printf("execing: %s\n", child_argv[0]); execve(child_argv[0], child_argv, env); printf("error in exec of stage1 :-(\n"); return 0; diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index ae07e9463..8de538126 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -126,17 +126,17 @@ static void spawn_interactive(void) int fd; char * dev = "/dev/tty6"; - log_message("spawning my interactive on %s", dev); + printf("spawning my interactive on %s\n", dev); if (!IS_TESTING) { fd = open(dev, O_RDWR); if (fd == -1) { - log_message("cannot open %s -- no interactive", dev); + printf("cannot open %s -- no interactive\n", dev); return; } if (mkfifo(interactive_fifo, O_RDWR)) { - log_message("cannot create fifo -- no interactive"); + printf("cannot create fifo -- no interactive\n"); return; } @@ -150,7 +150,7 @@ static void spawn_interactive(void) close(fd); setsid(); if (ioctl(0, TIOCSCTTY, NULL)) - log_perror("could not set new controlling tty"); + perror("could not set new controlling tty"); fif_out = open(interactive_fifo, O_WRONLY); printf("Please enter your command (availables: [+,-] [rescue,expert]).\n"); |