commit cb07cb002e0b3111e08748c00cdf68dda594936f
author Mihai Serban <mihai.serban@intel.com> Thu Apr 28 12:13:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 28 12:13:08 2016 +0000
tree 23b5b984c6e0cc3e5d3904c15efae9388029e3c5
parent 8850c0cc276d7a9942983fe26d2ed2c7a19e9f32
parent 61032d473edb92d24ff96c33feb487f266531c68

Merge "ueventd: relabel block devices nodes when processing subsequent add events" am: 94b0f37 am: 51cdf14
am: 355e4c8

* commit '355e4c835012d4e4e77fe847d41fe0b38dfdad36':
  ueventd: relabel block devices nodes when processing subsequent add events

Change-Id: I345b1d5dec3eb263b13adaa8a69d10ee55ca1635

rootdir/init.zygote32_64.rc

diff --git a/rootdir/init.zygote32_64.rc b/rootdir/init.zygote32_64.rc
index 555eda4..b50fe46 100644
--- a/rootdir/init.zygote32_64.rc
+++ b/rootdir/init.zygote32_64.rc
@@ -7,7 +7,7 @@
     onrestart restart cameraserver
     onrestart restart media
     onrestart restart netd
-    writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks
+    writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
 
 service zygote_secondary /system/bin/app_process64 -Xzygote /system/bin --zygote --socket-name=zygote_secondary
     class main

rootdir/init.zygote64_32.rc

diff --git a/rootdir/init.zygote64_32.rc b/rootdir/init.zygote64_32.rc
index 46f9f02..615fe66 100644
--- a/rootdir/init.zygote64_32.rc
+++ b/rootdir/init.zygote64_32.rc
@@ -7,7 +7,7 @@
     onrestart restart cameraserver
     onrestart restart media
     onrestart restart netd
-    writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks
+    writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
 
 service zygote_secondary /system/bin/app_process32 -Xzygote /system/bin --zygote --socket-name=zygote_secondary
     class main