Modify following changes related with bluetooth-tools.

Give cap_sys_moduel to kmod.
Give cap_net_admin to hciconfig
Add bluetooth-stack-up.service.
Add bluetooth-stack-down.service
Modify bluetooth-stack-down as root.

Change-Id: I5dc4401c5f8c6ef61aa3fbb834a70201920c7f45

diff --git a/config/set_capability b/config/set_capability
index 97f097208ea4e5f65a0b421fc0c770b96c5a644b..d5a9b3705ed744bee967cd3dbf148db12592a5bd 100755 (executable)
--- a/config/set_capability
+++ b/config/set_capability
@@ -647,6 +647,25 @@ if [ -e "/usr/bin/krate-mount" ]
 then /usr/sbin/setcap cap_sys_admin=ei /usr/bin/krate-mount
 fi
 
+# Package               platform/upstream/kmod
+# Date                  Nov 7, 2018
+# Required              cap_sys_module
+# cap_sys_module       To use insmod
+# This is requested by Bluetooth module, to be used in bluetooth-stack-up.service.
+
+if [ -e "/usr/bin/kmod" ]
+then /usr/sbin/setcap cap_sys_module=ei /usr/bin/kmod
+fi
+
+# Package               platform/upstream/bluez
+# Date                  Nov 7, 2018
+# Required              cap_net_admin
+# cap_sys_module       To control bt interface
+
+if [ -e "/usr/bin/hciconfig" ]
+then /usr/sbin/setcap cap_net_admin=ei /usr/bin/hciconfig
+fi
+
 # TODO: MOVE TO OTHER SCRIPT OR REMOVE
 # Requested by sooyeon.kim@samsung.com
 if [ -e "/etc/skel/share/.voice" ]

diff --git a/test/capability_test/new_capabilities_exception.list b/test/capability_test/new_capabilities_exception.list
index d5920d8e2279f7dc10c9de00cea236d6f2f73b39..64b38a9a6ae333da0727890058e1f5cff0fa248c 100755 (executable)
--- a/test/capability_test/new_capabilities_exception.list
+++ b/test/capability_test/new_capabilities_exception.list
@@ -59,4 +59,6 @@
 /usr/bin/cat = cap_sys_ptrace+ei
 /usr/bin/krate-mount = cap_sys_admin+ei
 /usr/bin/inm-manager = cap_net_admin,cap_net_raw+ei
-/usr/bin/session-bind = cap_sys_admin+ei
\ No newline at end of file
+/usr/bin/session-bind = cap_sys_admin+ei
+/usr/bin/kmod = cap_sys_module+ei
+/usr/bin/hciconfig = cap_net_admin+ei

diff --git a/test/new_service_test/emulator/mobile/systemd_service.list b/test/new_service_test/emulator/mobile/systemd_service.list
index 341dafc2640ed148c6e91faf88c28244c8ca7fd0..9dddc593ed1da99260ace07020eac5380eb67b3f 100755 (executable)
--- a/test/new_service_test/emulator/mobile/systemd_service.list
+++ b/test/new_service_test/emulator/mobile/systemd_service.list
@@ -8,15 +8,18 @@ bluetooth-address.service;network_fw;network_fw;System;
 bluetooth-force-hci-logger.service;network_fw;network_fw;System;
 bluetooth-frwk.service;network_fw;network_fw;System;
 bluetooth-frwk-core.service;network_fw;network_fw;System;
+bluetooth-hci-down.service;network_fw;network_fw:System
 bluetooth-hci-dump@.service;network_fw;network_fw;System;
 bluetooth-hci-logger.service;network_fw;network_fw;System;
 bluetooth-hci-logger-stop.service;network_fw;network_fw;System;
+bluetooth-hci-up.service;network_fw;network_fw:System
 bluetooth-map-agent.service;network_fw;network_fw;System;
 bluetooth-pbap-agent.service;network_fw;network_fw;System;
 bluetooth-share.service;network_fw;network_fw;System;
 bluetooth-share-start.service;network_fw;network_fw;System;
-bluetooth-stack-down.service;network_fw;network_fw;System;
+bluetooth-stack-down.service;root;root;System;
 bluetooth-stack-down-with-radio.service;network_fw;network_fw;System;
+bluetooth-stack-up.service;network_fw;network_fw;System;
 bluez-start.service;network_fw;network_fw;System;
 boot-animation.service;application;application;System;
 browser-provider.service;web_fw;web_fw;System;

diff --git a/test/new_service_test/emulator/tv/systemd_service.list b/test/new_service_test/emulator/tv/systemd_service.list
index 6df6f3f56470396af8afea8499a3086e2667536e..727a247d3bab845fc8deb29fb27b1db55d78914c 100755 (executable)
--- a/test/new_service_test/emulator/tv/systemd_service.list
+++ b/test/new_service_test/emulator/tv/systemd_service.list
@@ -7,11 +7,14 @@ bluetooth-address.service;network_fw;network_fw;System;
 bluetooth-force-hci-logger.service;network_fw;network_fw;System;
 bluetooth-frwk.service;network_fw;network_fw;System;
 bluetooth-frwk-core.service;network_fw;network_fw;System;
+bluetooth-hci-down.service;network_fw;network_fw:System
 bluetooth-hci-dump@.service;network_fw;network_fw;System;
 bluetooth-hci-logger.service;network_fw;network_fw;System;
 bluetooth-hci-logger-stop.service;network_fw;network_fw;System;
+bluetooth-hci-up.service;network_fw;network_fw:System
 bluetooth-share-start.service;network_fw;network_fw;System;
-bluetooth-stack-down.service;network_fw;network_fw;System;
+bluetooth-stack-down.service;root;root;System;
+bluetooth-stack-up.service;network_fw;network_fw;System;
 bluez-start.service;network_fw;network_fw;System;
 browser-provider.service;web_fw;web_fw;System;
 buxton2.service;buxton;buxton;System;

diff --git a/test/new_service_test/emulator/wearable/systemd_service.list b/test/new_service_test/emulator/wearable/systemd_service.list
index 2a6d225089c9d2fd8816835ee291bc81b2f60408..659719e47342eb64bd86f751f69262f59f97f5eb 100755 (executable)
--- a/test/new_service_test/emulator/wearable/systemd_service.list
+++ b/test/new_service_test/emulator/wearable/systemd_service.list
@@ -7,11 +7,14 @@ bluetooth-address.service;network_fw;network_fw;System;
 bluetooth-force-hci-logger.service;network_fw;network_fw;System;
 bluetooth-frwk.service;network_fw;network_fw;System;
 bluetooth-frwk-core.service;network_fw;network_fw;System;
+bluetooth-hci-down.service;network_fw;network_fw:System
 bluetooth-hci-dump@.service;network_fw;network_fw;System;
 bluetooth-hci-logger.service;network_fw;network_fw;System;
 bluetooth-hci-logger-stop.service;network_fw;network_fw;System;
+bluetooth-hci-up.service;network_fw;network_fw:System
 bluetooth-share-start.service;network_fw;network_fw;System;
-bluetooth-stack-down.service;network_fw;network_fw;System;
+bluetooth-stack-down.service;root;root;System;
+bluetooth-stack-up.service;network_fw;network_fw;System;
 bluez-start.service;network_fw;network_fw;System;
 boot-animation.service;application;application;System;
 buxton2.service;buxton;buxton;System;

diff --git a/test/new_service_test/target/mobile/systemd_service.list b/test/new_service_test/target/mobile/systemd_service.list
index 5dce964ab578f0af311cddd18957bb7a03197675..059e54b00bf3a978151ee0917408ffa5c3c58218 100755 (executable)
--- a/test/new_service_test/target/mobile/systemd_service.list
+++ b/test/new_service_test/target/mobile/systemd_service.list
@@ -9,16 +9,19 @@ bluetooth-force-hci-logger.service;network_fw;network_fw;System;
 bluetooth-frwk.service;network_fw;network_fw;System;
 bluetooth-frwk-core.service;network_fw;network_fw;System;
 bluetooth-hci-device.service;root;root;System;
+bluetooth-hci-down.service;network_fw;network_fw:System
 bluetooth-hci-dump@.service;network_fw;network_fw;System;
 bluetooth-hci-logger.service;network_fw;network_fw;System;
 bluetooth-hci-logger-stop.service;network_fw;network_fw;System;
+bluetooth-hci-up.service;network_fw;network_fw:System
 bluetooth-hciattach@.service;root;root;System;
 bluetooth-map-agent.service;network_fw;network_fw;System;
 bluetooth-pbap-agent.service;network_fw;network_fw;System;
 bluetooth-share.service;network_fw;network_fw;System;
 bluetooth-share-start.service;network_fw;network_fw;System;
-bluetooth-stack-down.service;network_fw;network_fw;System;
+bluetooth-stack-down.service;root;root;System;
 bluetooth-stack-down-with-radio.service;network_fw;network_fw;System;
+bluetooth-stack-up.service;network_fw;network_fw;System;
 bluez-start.service;network_fw;network_fw;System;
 boot-animation.service;application;application;System;
 browser-provider.service;web_fw;web_fw;System;

diff --git a/test/new_service_test/target/tv/systemd_service.list b/test/new_service_test/target/tv/systemd_service.list
index 3fa265ceba6f839991759eff2955c192c7bd1c81..34cf059c279bf30ef42c431fc32e1ad1c3e1cf92 100755 (executable)
--- a/test/new_service_test/target/tv/systemd_service.list
+++ b/test/new_service_test/target/tv/systemd_service.list
@@ -7,11 +7,14 @@ bluetooth-address.service;network_fw;network_fw;System;
 bluetooth-force-hci-logger.service;network_fw;network_fw;System;
 bluetooth-frwk.service;network_fw;network_fw;System;
 bluetooth-frwk-core.service;network_fw;network_fw;System;
+bluetooth-hci-down.service;network_fw;network_fw:System
 bluetooth-hci-dump@.service;network_fw;network_fw;System;
 bluetooth-hci-logger.service;network_fw;network_fw;System;
 bluetooth-hci-logger-stop.service;network_fw;network_fw;System;
+bluetooth-hci-up.service;network_fw;network_fw:System
 bluetooth-share-start.service;network_fw;network_fw;System;
-bluetooth-stack-down.service;network_fw;network_fw;System;
+bluetooth-stack-down.service;root;root;System;
+bluetooth-stack-up.service;network_fw;network_fw;System;
 bluez-start.service;network_fw;network_fw;System;
 browser-provider.service;web_fw;web_fw;System;
 buxton2.service;buxton;buxton;System;

diff --git a/test/new_service_test/target/wearable/systemd_service.list b/test/new_service_test/target/wearable/systemd_service.list
index 6351fa878ae21e56e34cb0133784ed6f0334ad94..3c13976dc0a9469f2812b97bcee89315c7bdc27c 100755 (executable)
--- a/test/new_service_test/target/wearable/systemd_service.list
+++ b/test/new_service_test/target/wearable/systemd_service.list
@@ -8,12 +8,15 @@ bluetooth-force-hci-logger.service;network_fw;network_fw;System;
 bluetooth-frwk.service;network_fw;network_fw;System;
 bluetooth-frwk-core.service;network_fw;network_fw;System;
 bluetooth-hci-device.service;root;root;System;
+bluetooth-hci-down.service;network_fw;network_fw:System
 bluetooth-hci-dump@.service;network_fw;network_fw;System;
 bluetooth-hci-logger.service;network_fw;network_fw;System;
 bluetooth-hci-logger-stop.service;network_fw;network_fw;System;
+bluetooth-hci-up.service;network_fw;network_fw:System
 bluetooth-hciattach@.service;root;root;System;
 bluetooth-share-start.service;network_fw;network_fw;System;
-bluetooth-stack-down.service;network_fw;network_fw;System;
+bluetooth-stack-down.service;root;root;System;
+bluetooth-stack-up.service;network_fw;network_fw;System;
 bluez-start.service;network_fw;network_fw;System;
 boot-animation.service;application;application;System;
 buxton2.service;buxton;buxton;System;