diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-12-10 08:40:29 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-12-10 08:40:29 +0000 |
| commit | d7e2e127a93afe2a88922ef94fa00fe8db39d834 (patch) | |
| tree | efd415c662a099496a75ee36f0f0da2338e6b43f /init | |
| parent | 2afabe8b830cc8c33f5f1984767af4b8dc54803b (diff) | |
| download | busybox-w32-d7e2e127a93afe2a88922ef94fa00fe8db39d834.tar.gz busybox-w32-d7e2e127a93afe2a88922ef94fa00fe8db39d834.tar.bz2 busybox-w32-d7e2e127a93afe2a88922ef94fa00fe8db39d834.zip | |
cttyhack: add missing ';'
init: remove pointless access() check
Diffstat (limited to 'init')
| -rw-r--r-- | init/init.c | 12 |
1 files changed, 7 insertions, 5 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) { |