Merge "Add tests for update_binary_command()."
diff --git a/etc/init.rc b/etc/init.rc
index 477e13d..2e3c7a7 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -75,9 +75,6 @@
trigger early-boot
trigger boot
-on property:sys.powerctl=*
- powerctl ${sys.powerctl}
-
service ueventd /sbin/ueventd
critical
seclabel u:r:ueventd:s0
diff --git a/update_verifier/update_verifier.rc b/update_verifier/update_verifier.rc
index 808f2c0..862b062 100644
--- a/update_verifier/update_verifier.rc
+++ b/update_verifier/update_verifier.rc
@@ -1,11 +1,11 @@
service update_verifier_nonencrypted /system/bin/update_verifier nonencrypted
user root
- group cache
+ group cache system
priority -20
ioprio rt 0
service update_verifier /system/bin/update_verifier ${vold.decrypt}
user root
- group cache
+ group cache system
priority -20
ioprio rt 0