Merge "adb: Fix problems detecting adb in more complicated USB configurations."
diff --git a/rootdir/init.rc b/rootdir/init.rc
index c39af6c..cd977e2 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -45,7 +45,7 @@
# Create cgroup mount points for process groups
mkdir /dev/cpuctl
mount cgroup none /dev/cpuctl cpu
- chown sytem system /dev/cpuctl
+ chown system system /dev/cpuctl
chown system system /dev/cpuctl/tasks
chmod 0777 /dev/cpuctl/tasks
write /dev/cpuctl/cpu.shares 1024
@@ -267,6 +267,9 @@
service vold /system/bin/vold
socket vold stream 0660 root mount
+service netd /system/bin/netd
+ socket netd stream 0660 root system
+
service nexus /system/bin/nexus
socket nexus stream 0660 root system
disabled