diff options
-rw-r--r-- | init/init.c | 12 | ||||
-rw-r--r-- | shell/cttyhack.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/init/init.c b/init/init.c index c0c8b17cb..baa5a5000 100644 --- a/init/init.c +++ b/init/init.c | |||
@@ -513,11 +513,13 @@ static void run_actions(int action) | |||
513 | for (a = init_action_list; a; a = tmp) { | 513 | for (a = init_action_list; a; a = tmp) { |
514 | tmp = a->next; | 514 | tmp = a->next; |
515 | if (a->action == action) { | 515 | if (a->action == action) { |
516 | /* a->terminal of "" means "init's console" */ | 516 | // Pointless: run() will error out if open of device fails. |
517 | if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) { | 517 | ///* a->terminal of "" means "init's console" */ |
518 | //message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/); | 518 | //if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) { |
519 | delete_init_action(a); | 519 | // //message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/); |
520 | } else if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) { | 520 | // delete_init_action(a); |
521 | //} else | ||
522 | if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) { | ||
521 | waitfor(run(a)); | 523 | waitfor(run(a)); |
522 | delete_init_action(a); | 524 | delete_init_action(a); |
523 | } else if (a->action & ONCE) { | 525 | } else if (a->action & ONCE) { |
diff --git a/shell/cttyhack.c b/shell/cttyhack.c index 915ab5142..2015700ab 100644 --- a/shell/cttyhack.c +++ b/shell/cttyhack.c | |||
@@ -69,7 +69,7 @@ int cttyhack_main(int argc, char **argv) | |||
69 | dup2(fd, 2); | 69 | dup2(fd, 2); |
70 | while (fd > 2) close(fd--); | 70 | while (fd > 2) close(fd--); |
71 | /* Some other session may have it as ctty. Steal it from them */ | 71 | /* Some other session may have it as ctty. Steal it from them */ |
72 | ioctl(0, TIOCSCTTY, 1) | 72 | ioctl(0, TIOCSCTTY, 1); |
73 | } | 73 | } |
74 | 74 | ||
75 | BB_EXECVP(argv[0], argv); | 75 | BB_EXECVP(argv[0], argv); |