diff options
Diffstat (limited to 'init.c')
-rw-r--r-- | init.c | 21 |
1 files changed, 3 insertions, 18 deletions
@@ -99,7 +99,7 @@ run(const char* program, const char* const* arguments, | |||
99 | }; | 99 | }; |
100 | 100 | ||
101 | static const char press_enter[] = | 101 | static const char press_enter[] = |
102 | "Please press Enter to activate this console. "; | 102 | "\nPlease press Enter to activate this console. "; |
103 | 103 | ||
104 | int pid; | 104 | int pid; |
105 | 105 | ||
@@ -388,13 +388,8 @@ init_main(int argc, char * * argv) | |||
388 | arguments[j] = 0; | 388 | arguments[j] = 0; |
389 | 389 | ||
390 | if ( run_rc ) { | 390 | if ( run_rc ) { |
391 | printf("running %s with args \"",rc); | 391 | run(rc, arguments, console, 0); |
392 | for ( j = 0; j < argc; j++ ) { | 392 | //waitfor(run(rc, arguments, console, 0)); |
393 | printf("%s ", arguments[j]); | ||
394 | } | ||
395 | printf("\" on console %s\n", console); | ||
396 | waitfor(run(rc, arguments, console, 0)); | ||
397 | printf("done.\n"); | ||
398 | } | 393 | } |
399 | 394 | ||
400 | if ( 0 == create_swap) { | 395 | if ( 0 == create_swap) { |
@@ -414,19 +409,9 @@ init_main(int argc, char * * argv) | |||
414 | /* | 409 | /* |
415 | arguments[0] = tty_commands[0]; | 410 | arguments[0] = tty_commands[0]; |
416 | */ | 411 | */ |
417 | printf("running %s with args \"",tty_commands[0]); | ||
418 | for ( j = 0; j < argc; j++ ) { | ||
419 | printf("%s ", arguments[j]); | ||
420 | } | ||
421 | printf("\" on console %s\n", first_terminal); | ||
422 | pid1 = run(tty_commands[0], arguments, first_terminal, 1); | 412 | pid1 = run(tty_commands[0], arguments, first_terminal, 1); |
423 | } | 413 | } |
424 | if ( pid2 == 0 && tty_commands[1] ) { | 414 | if ( pid2 == 0 && tty_commands[1] ) { |
425 | printf("running %s with args \"",tty_commands[0]); | ||
426 | for ( j = 0; j < argc; j++ ) { | ||
427 | printf("%s ", arguments[j]); | ||
428 | } | ||
429 | printf("\" on console %s\n", first_terminal); | ||
430 | pid2 = run(tty_commands[1], arguments, second_terminal, 1); | 415 | pid2 = run(tty_commands[1], arguments, second_terminal, 1); |
431 | } | 416 | } |
432 | wpid = wait(&status); | 417 | wpid = wait(&status); |