diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-09-01 08:28:21 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-09-01 08:28:21 -0700 |
| commit | 8c92ba1921fc8dc3fc7cc39ef854e9ee70fafc67 (patch) | |
| tree | db381770ca1f3244b0aedfd5633b0f6efcf2fab5 /rootdir | |
| parent | bdb9831ce9195c15ab6f2c01d809fb7946dd2f34 (diff) | |
| parent | e86a2c7ceb767bce5c9a6706d7f36289d3e5de49 (diff) | |
| download | system_core-8c92ba1921fc8dc3fc7cc39ef854e9ee70fafc67.tar.gz system_core-8c92ba1921fc8dc3fc7cc39ef854e9ee70fafc67.tar.bz2 system_core-8c92ba1921fc8dc3fc7cc39ef854e9ee70fafc67.zip | |
merge from open-source master
Diffstat (limited to 'rootdir')
| -rwxr-xr-x | rootdir/etc/init.goldfish.sh | 14 | ||||
| -rw-r--r-- | rootdir/init.rc | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/rootdir/etc/init.goldfish.sh b/rootdir/etc/init.goldfish.sh index f1b801d9..5ff0a3a4 100755 --- a/rootdir/etc/init.goldfish.sh +++ b/rootdir/etc/init.goldfish.sh @@ -3,16 +3,20 @@ ifconfig eth0 10.0.2.15 netmask 255.255.255.0 up route add default gw 10.0.2.2 dev eth0 -qemud=`getprop.ro.kernel.android.qemud` -if test -z "$qemud"; then +qemud=`getprop ro.kernel.android.qemud` +case "$qemud" in + "") radio_ril=`getprop ro.kernel.android.ril` - if test -z "$radio_ril"; then + case "$radio_ril" in + "") # no need for the radio interface daemon # telephony is entirely emulated in Java setprop ro.radio.noril yes stop ril-daemon - fi -fi + ;; + esac + ;; +esac num_dns=`getprop ro.kernel.android.ndns` case "$num_dns" in diff --git a/rootdir/init.rc b/rootdir/init.rc index 297afa1f..d63d34d2 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -39,7 +39,7 @@ loglevel 3 # 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 |