Fix upgrade script.

- upgrade script should include security-config setting (ex : group id set)

Change-Id: Ic07f9b0606033df6728c1fa0e9d7a86816139b60

diff --git a/config/group_id_setting b/config/group_id_setting
index 864cb498a683058a0a29c87d138d1f7ae6241ff6..f588b089bf740c4d7e09dfb8b3a25b780eb70dc2 100755 (executable)
--- a/config/group_id_setting
+++ b/config/group_id_setting
@@ -55,38 +55,38 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 /usr/sbin/useradd broadcasting -M -u 1001 -g 1001 -d /var/lib/empty -s /sbin/nologin -c "broadcasting"
 /usr/sbin/useradd testing -M -u 1026 -g 1026 -d /var/lib/empty -s /sbin/nologin -c "testing"
 
-usr/sbin/usermod -aG system_share system_fw
-usr/sbin/usermod -aG system_share web_fw
-usr/sbin/usermod -aG system_share app_fw
-usr/sbin/usermod -aG system_share security_fw
-usr/sbin/usermod -aG system_share multimedia_fw
-usr/sbin/usermod -aG system_share graphic_fw
-usr/sbin/usermod -aG system_share ui_fw
-usr/sbin/usermod -aG system_share network_fw
-usr/sbin/usermod -aG system_share telephony
-usr/sbin/usermod -aG system_share service_fw
-usr/sbin/usermod -aG system_share messaging
-usr/sbin/usermod -aG system_share social
-usr/sbin/usermod -aG system_share location
-usr/sbin/usermod -aG system_share sensor
-usr/sbin/usermod -aG system_share sdk
-usr/sbin/usermod -aG system_share scm
-usr/sbin/usermod -aG system_share application
-usr/sbin/usermod -aG system_share broadcasting
-usr/sbin/usermod -aG system_share testing
+/usr/sbin/usermod -aG system_share system_fw
+/usr/sbin/usermod -aG system_share web_fw
+/usr/sbin/usermod -aG system_share app_fw
+/usr/sbin/usermod -aG system_share security_fw
+/usr/sbin/usermod -aG system_share multimedia_fw
+/usr/sbin/usermod -aG system_share graphic_fw
+/usr/sbin/usermod -aG system_share ui_fw
+/usr/sbin/usermod -aG system_share network_fw
+/usr/sbin/usermod -aG system_share telephony
+/usr/sbin/usermod -aG system_share service_fw
+/usr/sbin/usermod -aG system_share messaging
+/usr/sbin/usermod -aG system_share social
+/usr/sbin/usermod -aG system_share location
+/usr/sbin/usermod -aG system_share sensor
+/usr/sbin/usermod -aG system_share sdk
+/usr/sbin/usermod -aG system_share scm
+/usr/sbin/usermod -aG system_share application
+/usr/sbin/usermod -aG system_share broadcasting
+/usr/sbin/usermod -aG system_share testing
 
-usr/sbin/usermod -aG system_share buxton
-usr/sbin/usermod -aG system_share key-manager
-usr/sbin/usermod -aG system_share cynara
-usr/sbin/usermod -aG system_share dbus
-usr/sbin/usermod -aG system_share pulse
-usr/sbin/usermod -aG system_share log
-usr/sbin/usermod -aG input sensor
-usr/sbin/usermod -aG bt_use network_fw
-usr/sbin/usermod -aG audio telephony
-usr/sbin/usermod -aG display multimedia_fw
-usr/sbin/usermod -aG audio multimedia_fw
-usr/sbin/usermod -aG video multimedia_fw
-usr/sbin/usermod -aG disk telephony
-usr/sbin/usermod -aG display application
+/usr/sbin/usermod -aG system_share buxton
+/usr/sbin/usermod -aG system_share key-manager
+/usr/sbin/usermod -aG system_share cynara
+/usr/sbin/usermod -aG system_share dbus
+/usr/sbin/usermod -aG system_share pulse
+/usr/sbin/usermod -aG system_share log
+/usr/sbin/usermod -aG input sensor
+/usr/sbin/usermod -aG bt_use network_fw
+/usr/sbin/usermod -aG audio telephony
+/usr/sbin/usermod -aG display multimedia_fw
+/usr/sbin/usermod -aG audio multimedia_fw
+/usr/sbin/usermod -aG video multimedia_fw
+/usr/sbin/usermod -aG disk telephony
+/usr/sbin/usermod -aG display application
 

diff --git a/upgrade/201.security_upgrade.sh b/upgrade/201.security_upgrade.sh
index bb1ebd84023ea91cbd60ff4b5d15347a279db7cd..82c3b3ff03fe85386709d8e5f0e97e731d563bfd 100644 (file)
--- a/upgrade/201.security_upgrade.sh
+++ b/upgrade/201.security_upgrade.sh
@@ -2,6 +2,11 @@
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
+# Init security-configuration
+/usr/share/security-config/group_id_setting
+/usr/share/security-config/set_label
+/usr/share/security-config/set_capability
+
 # Migration of cynara DB
 CYNARA_VERSION=$(rpm -qf /usr/bin/cynara  | cut -d "-" -f2)
 cynara-db-migration upgrade -f 0.0.0 -t $CYNARA_VERSION