From a285984ae404b89e87a1f97486bf8f9c8a0fab0f Mon Sep 17 00:00:00 2001
From: Tom Cherry <tomcherry@google.com>
Date: Fri, 14 Aug 2015 13:06:45 -0700
Subject: [PATCH] bundle init.rc contents with its service

Bug: 23186545
Change-Id: I82d8b6dc54ebe32ceb1ed997aaab3701ee7b6c4a
---
 Android.mk |  3 +++
 vdc.rc     | 13 +++++++++++++
 vold.rc    |  4 ++++
 3 files changed, 20 insertions(+)
 create mode 100644 vdc.rc
 create mode 100644 vold.rc

diff --git a/Android.mk b/Android.mk
index 94d6ca2..99e644d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -80,6 +80,8 @@ LOCAL_SRC_FILES := \
 	main.cpp \
 	$(common_src_files)
 
+LOCAL_INIT_RC := vold.rc
+
 LOCAL_C_INCLUDES := $(common_c_includes)
 LOCAL_CFLAGS := $(vold_cflags)
 LOCAL_CONLYFLAGS := $(vold_conlyflags)
@@ -104,5 +106,6 @@ LOCAL_MODULE:= vdc
 LOCAL_SHARED_LIBRARIES := libcutils
 LOCAL_CFLAGS := $(vold_cflags)
 LOCAL_CONLYFLAGS := $(vold_conlyflags)
+LOCAL_INIT_RC := vdc.rc
 
 include $(BUILD_EXECUTABLE)
diff --git a/vdc.rc b/vdc.rc
new file mode 100644
index 0000000..e842869
--- /dev/null
+++ b/vdc.rc
@@ -0,0 +1,13 @@
+# One shot invocation to deal with encrypted volume.
+service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted
+    disabled
+    oneshot
+    # vold will set vold.decrypt to trigger_restart_framework (default
+    # encryption) or trigger_restart_min_framework (other encryption)
+
+# One shot invocation to encrypt unencrypted volumes
+service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default
+    disabled
+    oneshot
+    # vold will set vold.decrypt to trigger_restart_framework (default
+    # encryption)
diff --git a/vold.rc b/vold.rc
new file mode 100644
index 0000000..dcf77a2
--- /dev/null
+++ b/vold.rc
@@ -0,0 +1,4 @@
+service vold /system/bin/vold
+    class core
+    socket vold stream 0660 root mount
+    ioprio be 2