aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2012-03-19 13:20:46 +0000
committerJon Medhurst <tixy@linaro.org>2012-03-19 13:22:45 +0000
commit3245a9bf3f780a74f5e63707c2cc0d357617c88f (patch)
treecea4426a5ab31e71d6c04cafd68d5d66641cbb33
parent0036e1d132c60dd7ae68cf0478b7e74509205790 (diff)
downloadsnowball-3245a9bf3f780a74f5e63707c2cc0d357617c88f.tar.gz
snowball: Change gatord config file to a writable location
This fixes LP Bug #942592 for Snowball. The original fix was done in the common init.rc by http://review.android.git.linaro.org/#change,1551 but Snowball has its own copy of this file so this patch cut'n'pastes the relevent bits. Change-Id: I9060db74297d21f72ce1123999257bde98ac15d6 Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--init.rc9
-rw-r--r--init.st-ericssonsnowballplatform.rc7
2 files changed, 9 insertions, 7 deletions
diff --git a/init.rc b/init.rc
index 60cb35a..d9446bb 100644
--- a/init.rc
+++ b/init.rc
@@ -159,6 +159,7 @@ on post-fs-data
mkdir /data/misc 01771 system misc
mkdir /data/misc/bluetoothd 0770 bluetooth bluetooth
mkdir /data/misc/bluetooth 0770 system system
+ mkdir /data/misc/gatord 0700 root root
mkdir /data/misc/keystore 0700 keystore keystore
mkdir /data/misc/keychain 0771 system system
mkdir /data/misc/vpn 0770 system vpn
@@ -316,6 +317,9 @@ on boot
chown system system /sys/kernel/ipv4/tcp_rmem_max
chown root radio /proc/cmdline
+# Load gator module
+ insmod /system/modules/gator.ko
+
# Define TCP buffer sizes for various networks
# ReadMin, ReadInitial, ReadMax, WriteMin, WriteInitial, WriteMax,
setprop net.tcp.buffersize.default 4096,87380,110208,4096,16384,110208
@@ -592,3 +596,8 @@ service dumpstate /system/bin/dumpstate -s
socket dumpstate stream 0660 shell log
disabled
oneshot
+
+# userspace daemon needed for gator
+service gatord /system/bin/gatord -c /data/misc/gatord/configuration.xml
+ class main
+ user root
diff --git a/init.st-ericssonsnowballplatform.rc b/init.st-ericssonsnowballplatform.rc
index f2158bb..069835c 100644
--- a/init.st-ericssonsnowballplatform.rc
+++ b/init.st-ericssonsnowballplatform.rc
@@ -96,7 +96,6 @@ on boot
chown system system /sys/class/graphics/fb0/fit_to_screen
chown system system /sys/class/graphics/fb1/overlays
- insmod /system/modules/gator.ko
insmod /system/modules/mac80211.ko
insmod /system/modules/cw1200_core.ko
setprop wifi.interface wlan0
@@ -122,9 +121,3 @@ service faketsd /system/bin/faketsd
user bluetooth
group bluetooth
oneshot
-
-#userspace daemon needed for gator
-service gatord /system/bin/gatord
- class main
- user root
-