diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-05-05 22:28:54 -0700 |
|---|---|---|
| committer | Jaikumar Ganesh <jaikumar@google.com> | 2009-06-09 17:21:38 -0700 |
| commit | 1d36696821cd81ed7b668bb9d2b0b8a43540ccd2 (patch) | |
| tree | 08fdf6f6dc1e377964dbfd73c66fdf0955782a79 | |
| parent | 61cd81dd8d7075f79b482315cd465991c08da68d (diff) | |
| download | system_core-1d36696821cd81ed7b668bb9d2b0b8a43540ccd2.zip system_core-1d36696821cd81ed7b668bb9d2b0b8a43540ccd2.tar.gz system_core-1d36696821cd81ed7b668bb9d2b0b8a43540ccd2.tar.bz2 | |
Bluez4 changes
Rename hcid to bluetoothd and change permissions.
| -rw-r--r-- | include/private/android_filesystem_config.h | 2 | ||||
| -rw-r--r-- | rootdir/init.rc | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 4590626..1a14842 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -157,7 +157,7 @@ static struct fs_path_config android_files[] = { { 00550, AID_ROOT, AID_SHELL, "system/etc/init.gprs-pppd" }, { 00550, AID_DHCP, AID_SHELL, "system/etc/dhcpcd/dhcpcd-run-hooks" }, { 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/dbus.conf" }, - { 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/bluez/hcid.conf" }, + { 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/bluez/main.conf" }, { 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/bluez/input.conf" }, { 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/bluez/audio.conf" }, { 00440, AID_RADIO, AID_AUDIO, "/system/etc/AudioPara4.csv" }, diff --git a/rootdir/init.rc b/rootdir/init.rc index 25463a8..357e332 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -74,7 +74,7 @@ loglevel 3 # create basic filesystem structure mkdir /data/misc 01771 system misc - mkdir /data/misc/hcid 0770 bluetooth bluetooth + mkdir /data/misc/bluetoothd 0770 bluetooth bluetooth mkdir /data/misc/keystore 0770 keystore keystore mkdir /data/misc/vpn 0770 system system mkdir /data/misc/vpn/profiles 0770 system system @@ -258,16 +258,18 @@ service bootanim /system/bin/bootanimation disabled oneshot -service dbus /system/bin/dbus-daemon --system --nofork +#STOPSHIP: Remove logwrapper before production +service dbus /system/bin/logwrapper /system/bin/dbus-daemon --system --nofork socket dbus stream 660 bluetooth bluetooth user bluetooth group bluetooth net_bt_admin -service hcid /system/bin/hcid -s -n -f /etc/bluez/hcid.conf +#STOPSHIP: Remove logwrapper and -d option before production +service bluetoothd /system/bin/logwrapper /system/bin/bluetoothd -d -n socket bluetooth stream 660 bluetooth bluetooth socket dbus_bluetooth stream 660 bluetooth bluetooth # init.rc does not yet support applying capabilities, so run as root and - # let hcid drop uid to bluetooth with the right linux capabilities + # let bluetoothd drop uid to bluetooth with the right linux capabilities group bluetooth net_bt_admin misc disabled |