Merge "libnl: nl_socket_alloc() Bugfix"
diff --git a/rootdir/init.rc b/rootdir/init.rc
index d7b44f9..a2d9f18 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -188,6 +188,8 @@
chown system system /sys/class/android_usb/android0/f_mass_storage/lun/file
chmod 0660 /sys/class/android_usb/android0/f_mass_storage/lun/file
+ chown system system /sys/class/android_usb/android0/f_rndis/ethaddr
+ chmod 0660 /sys/class/android_usb/android0/f_rndis/ethaddr
on boot
# basic network init
@@ -437,7 +439,8 @@
service media /system/bin/mediaserver
class main
user media
- group audio camera inet net_bt net_bt_admin
+ # STOPSHIP: remove system from mediaserver groups
+ group audio camera inet net_bt net_bt_admin system
ioprio rt 4
service bootanim /system/bin/bootanimation