summaryrefslogtreecommitdiffstats
path: root/init/signal_handler.c
diff options
context:
space:
mode:
authorKen Sumrall <ksumrall@android.com>2010-12-03 16:33:31 -0800
committerKen Sumrall <ksumrall@android.com>2010-12-18 19:03:54 -0800
commit752923c168009d03e9e00e590155fbd0a2880ccb (patch)
treec35bf2554955ca2494be8bcc839d5f00a9b5553b /init/signal_handler.c
parent36f93f01201bbff4a411c73adfbaf08bd93b1ad2 (diff)
downloadsystem_core-752923c168009d03e9e00e590155fbd0a2880ccb.zip
system_core-752923c168009d03e9e00e590155fbd0a2880ccb.tar.gz
system_core-752923c168009d03e9e00e590155fbd0a2880ccb.tar.bz2
Changes to init to support encrypted filesystems.
These are the changes to init and init.rc necessary to support booting with and encrypted /data filesystem. A corresponding change to init.<device>.rc goes along with this change. Change-Id: I0c7e2cc39568358014a82e317735c0eae14dd683
Diffstat (limited to 'init/signal_handler.c')
-rw-r--r--init/signal_handler.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/signal_handler.c b/init/signal_handler.c
index 3e5d136..833e59d 100644
--- a/init/signal_handler.c
+++ b/init/signal_handler.c
@@ -83,8 +83,8 @@ static int wait_for_one_process(int block)
svc->flags |= SVC_DISABLED;
}
- /* disabled processes do not get restarted automatically */
- if (svc->flags & SVC_DISABLED) {
+ /* disabled and reset processes do not get restarted automatically */
+ if (svc->flags & (SVC_DISABLED | SVC_RESET) ) {
notify_service_state(svc->name, "stopped");
return 0;
}