diff options
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 2 | ||||
| -rwxr-xr-x | rootdir/etc/init.goldfish.sh | 10 | ||||
| -rw-r--r-- | rootdir/etc/ueventd.goldfish.rc | 2 | ||||
| -rw-r--r-- | rootdir/init.rc | 18 | ||||
| -rw-r--r-- | rootdir/ueventd.rc | 2 |
5 files changed, 31 insertions, 3 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 6d6012e..1a9e06f 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -7,7 +7,7 @@ copy_from := \ etc/dbus.conf \ etc/hosts -ifeq ($(TARGET_PRODUCT),generic) +ifeq ($(TARGET_PRODUCT),full) copy_from += etc/vold.fstab endif diff --git a/rootdir/etc/init.goldfish.sh b/rootdir/etc/init.goldfish.sh index 5ff0a3a..cfa2c82 100755 --- a/rootdir/etc/init.goldfish.sh +++ b/rootdir/etc/init.goldfish.sh @@ -45,3 +45,13 @@ esac # this line doesn't really do anything useful. however without it the # previous setprop doesn't seem to apply for some really odd reason setprop ro.qemu.init.completed 1 + +# set up the second interface (for inter-emulator connections) +# if required +my_ip=`getprop net.shared_net_ip` +case "$my_ip" in + "") + ;; + *) ifconfig eth1 "$my_ip" netmask 255.255.255.0 up + ;; +esac diff --git a/rootdir/etc/ueventd.goldfish.rc b/rootdir/etc/ueventd.goldfish.rc index e69de29..f4262fb 100644 --- a/rootdir/etc/ueventd.goldfish.rc +++ b/rootdir/etc/ueventd.goldfish.rc @@ -0,0 +1,2 @@ +/dev/qemu_trace 0666 system system +/dev/qemu_pipe 0666 system system diff --git a/rootdir/init.rc b/rootdir/init.rc index 8227273..f6e0196 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -166,6 +166,11 @@ on post-fs chown system system /data/dalvik-cache chmod 0771 /data/dalvik-cache + # create resource-cache and double-check the perms + mkdir /data/resource-cache 0771 system system + chown system system /data/resource-cache + chmod 0771 /data/resource-cache + # create the lost+found directories, so as to enforce our permissions mkdir /data/lost+found 0770 mkdir /cache/lost+found 0770 @@ -176,6 +181,11 @@ on post-fs chown root root /cache/lost+found chmod 0770 /cache/lost+found + # create data/drm directory + mkdir /data/drm 0774 drm drm + chown drm drm /data/drm + chmod 0774 /data/drm + on boot # basic network init ifup lo @@ -315,6 +325,7 @@ service vold /system/bin/vold service netd /system/bin/netd socket netd stream 0660 root system + socket dnsproxyd stream 0660 root inet service debuggerd /system/bin/debuggerd @@ -331,6 +342,13 @@ service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-sys onrestart restart media onrestart restart netd +service drm /system/bin/drmserver + user drm + group system root inet + +service drmio /system/bin/drmioserver + user drmio + service media /system/bin/mediaserver user media group system audio camera graphics inet net_bt net_bt_admin net_raw diff --git a/rootdir/ueventd.rc b/rootdir/ueventd.rc index 254a1cf..d475c44 100644 --- a/rootdir/ueventd.rc +++ b/rootdir/ueventd.rc @@ -64,8 +64,6 @@ /dev/snd/dsp1 0660 system audio /dev/snd/mixer 0660 system audio /dev/smd0 0640 radio radio -/dev/qemu_trace 0666 system system -/dev/qemu_pipe 0666 system system /dev/qmi 0640 radio radio /dev/qmi0 0640 radio radio /dev/qmi1 0640 radio radio |