diff options
| author | Colin Cross <ccross@android.com> | 2010-04-22 14:40:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-22 14:40:40 -0700 |
| commit | 24827fe35d73c5528f2365a11b028ac6ccc43874 (patch) | |
| tree | 180822988edd2011bf0edab317277028bea60485 | |
| parent | d0eacb8aee77f01edadf525019f8dd1e43671ce7 (diff) | |
| parent | ebd4613bfc8d926503f7de38240529ce0b1997ee (diff) | |
| download | system_core-24827fe35d73c5528f2365a11b028ac6ccc43874.tar.gz system_core-24827fe35d73c5528f2365a11b028ac6ccc43874.tar.bz2 system_core-24827fe35d73c5528f2365a11b028ac6ccc43874.zip | |
am ebd4613b: init: Fix init spinning once init.rc is complete
| -rwxr-xr-x | init/init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/init.c b/init/init.c index 4f4059b8..8f95da78 100755 --- a/init/init.c +++ b/init/init.c @@ -492,6 +492,7 @@ void execute_one_command(void) if (!cur_action || !cur_command || is_last_command(cur_action, cur_command)) { cur_action = action_remove_queue_head(); + cur_command = NULL; if (!cur_action) return; INFO("processing action %p (%s)\n", cur_action, cur_action->name); @@ -762,7 +763,7 @@ int main(int argc, char **argv) timeout = 0; } - if (!action_queue_empty() || cur_command) + if (!action_queue_empty() || cur_action) timeout = 0; #if BOOTCHART |