diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-09-22 07:56:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-22 07:56:56 -0700 |
| commit | 44e96d4302d5878ae7727de43a0c76525a4a68d8 (patch) | |
| tree | 55f0bd9670b606e866c3610fa2a815a09df91c5a | |
| parent | 303e6ac804c110ae54a51b56a217d70e97313c10 (diff) | |
| parent | a503456526359767ffb383a06835308f62172dde (diff) | |
| download | system_core-44e96d4302d5878ae7727de43a0c76525a4a68d8.zip system_core-44e96d4302d5878ae7727de43a0c76525a4a68d8.tar.gz system_core-44e96d4302d5878ae7727de43a0c76525a4a68d8.tar.bz2 | |
Merge "emulator: Move qemu-props to core service"
| -rw-r--r-- | rootdir/etc/init.goldfish.rc | 12 | ||||
| -rwxr-xr-x | rootdir/etc/init.goldfish.sh | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/rootdir/etc/init.goldfish.rc b/rootdir/etc/init.goldfish.rc index 1ac09ca..83b7f8a 100644 --- a/rootdir/etc/init.goldfish.rc +++ b/rootdir/etc/init.goldfish.rc @@ -52,6 +52,18 @@ service goldfish-setup /system/etc/init.goldfish.sh group root oneshot +# The qemu-props program is used to set various system +# properties on boot. It must be run early during the boot +# process to avoid race conditions with other daemons that +# might read them (e.g. surface flinger), so define it in +# class 'core' +# +service qemu-props /system/bin/qemu-props + class core + user root + group root + oneshot + service qemud /system/bin/qemud socket qemud stream 666 oneshot diff --git a/rootdir/etc/init.goldfish.sh b/rootdir/etc/init.goldfish.sh index 1156dd7..ece75b4 100755 --- a/rootdir/etc/init.goldfish.sh +++ b/rootdir/etc/init.goldfish.sh @@ -57,10 +57,6 @@ case "$boot_anim" in ;; esac -# call 'qemu-props' to set system properties from the emulator. -# -/system/bin/qemu-props - # set up the second interface (for inter-emulator connections) # if required my_ip=`getprop net.shared_net_ip` |