diff options
author | Android (Google) Code Review | 2009-06-30 21:37:05 -0500 |
---|---|---|
committer | Android (Google) Code Review | 2009-06-30 21:37:05 -0500 |
commit | 5c49135b032235f82560d5e55b0e4c547506516b (patch) | |
tree | 6070d08838abea54d638b5ca05f04632cd5a2c10 | |
parent | 9ad18f0576f1945419d31b56fea6987210521c35 (diff) | |
parent | 51afbf583819f3bdfc96f3c66c9c3444803e792a (diff) | |
download | platform-system-core-5c49135b032235f82560d5e55b0e4c547506516b.tar.gz platform-system-core-5c49135b032235f82560d5e55b0e4c547506516b.tar.xz platform-system-core-5c49135b032235f82560d5e55b0e4c547506516b.zip |
Merge change 5852 into donut
* changes:
rootdir: Modify init.rc to run mtpd/racoon as a non-root user.
-rw-r--r-- | rootdir/init.rc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 23ee1c8a5..ac066fad2 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc | |||
@@ -286,13 +286,17 @@ service installd /system/bin/installd | |||
286 | service flash_recovery /system/bin/flash_image recovery /system/recovery.img | 286 | service flash_recovery /system/bin/flash_image recovery /system/recovery.img |
287 | oneshot | 287 | oneshot |
288 | 288 | ||
289 | service racoon /system/bin/racoon -F -f /etc/racoon/racoon.conf | 289 | service racoon /system/bin/racoon |
290 | socket racoon stream 600 system system | 290 | socket racoon stream 600 system system |
291 | # racoon will setuid to vpn after getting necessary resources. | ||
292 | group net_admin keystore | ||
291 | disabled | 293 | disabled |
292 | oneshot | 294 | oneshot |
293 | 295 | ||
294 | service mtpd /system/bin/mtpd | 296 | service mtpd /system/bin/mtpd |
295 | socket mtpd stream 600 system system | 297 | socket mtpd stream 600 system system |
298 | user vpn | ||
299 | group vpn net_admin net_raw | ||
296 | disabled | 300 | disabled |
297 | oneshot | 301 | oneshot |
298 | 302 | ||