Separate popup systemd configs by platform version

Don't declare socket smack ip in/out label for platform version 3.0
because it's created by user session so no perm to smack label change
and no need to do it at all because default label same to what we want
to set.

Change-Id: Ib1310cca2669105eb37579193f9ff1705b77bf8f
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1b9339..a9d792a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,9 +78,6 @@ CONFIGURE_FILE(packaging/${SERVICE_NAME}-common.manifest.in ${SERVICE_NAME}-comm
 
 IF (PLATFORM_VERSION_3)
        ADD_DEFINITIONS("-DPLATFORM_VERSION_3")
-       SET(DECLARE_POPUP_USER "")
-       SET(DECLARE_POPUP_GROUP "")
-       SET(DECLARE_POPUP_SMACK_PROCESS_LABEL "")
 
        ADD_DEFINITIONS("-DTZ_SYS_STORAGE=\"${TZ_SYS_STORAGE}\"")
        ADD_DEFINITIONS("-DTZ_SYS_RW_APP=\"${TZ_SYS_RW_APP}\"")
@@ -90,9 +87,6 @@ IF (PLATFORM_VERSION_3)
        CONFIGURE_FILE(packaging/${SERVICE_NAME}-test.manifest.in ${SERVICE_NAME}-test.manifest @ONLY)
        CONFIGURE_FILE(data/scripts/${SERVICE_NAME}-upgrade.sh.in data/scripts/${SERVICE_NAME}-upgrade.sh @ONLY)
 ELSE (PLATFORM_VERSION_3)
-       SET(DECLARE_POPUP_USER User=app)
-       SET(DECLARE_POPUP_GROUP Group=app)
-       SET(DECLARE_POPUP_SMACK_PROCESS_LABEL SmackProcessLabel=${SERVICE_NAME})
        CONFIGURE_FILE(packaging/${SERVICE_NAME}.manifest.smack.in ${SERVICE_NAME}.manifest @ONLY)
        CONFIGURE_FILE(packaging/${SERVICE_NAME}-test.manifest.smack.in ${SERVICE_NAME}-test.manifest @ONLY)
 ENDIF (PLATFORM_VERSION_3)

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index ff1a829..ead31e0 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -1,9 +1,29 @@
+# Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
 CONFIGURE_FILE(${SERVICE_NAME}.service.in ${SERVICE_NAME}.service @ONLY)
 CONFIGURE_FILE(${SERVICE_NAME}-cs.socket.in ${SERVICE_NAME}-cs.socket @ONLY)
 CONFIGURE_FILE(${SERVICE_NAME}-wp.socket.in ${SERVICE_NAME}-wp.socket @ONLY)
 CONFIGURE_FILE(${SERVICE_NAME}-admin.socket.in ${SERVICE_NAME}-admin.socket @ONLY)
-CONFIGURE_FILE(${SERVICE_NAME}-popup.service.in ${SERVICE_NAME}-popup.service @ONLY)
-CONFIGURE_FILE(${SERVICE_NAME}-popup.socket.in ${SERVICE_NAME}-popup.socket @ONLY)
+
+IF (PLATFORM_VERSION_3)
+       CONFIGURE_FILE(${SERVICE_NAME}-popup.service.in ${SERVICE_NAME}-popup.service @ONLY)
+       CONFIGURE_FILE(${SERVICE_NAME}-popup.socket.in ${SERVICE_NAME}-popup.socket @ONLY)
+ELSE (PLATFORM_VERSION_3)
+       CONFIGURE_FILE(${SERVICE_NAME}-popup.service.old.in ${SERVICE_NAME}-popup.service @ONLY)
+       CONFIGURE_FILE(${SERVICE_NAME}-popup.socket.old.in ${SERVICE_NAME}-popup.socket @ONLY)
+ENDIF (PLATFORM_VERSION_3)
 
 INSTALL(
        FILES

diff --git a/systemd/csr-popup.service.in b/systemd/csr-popup.service.in
index 204716d..d137834 100644 (file)
--- a/systemd/csr-popup.service.in
+++ b/systemd/csr-popup.service.in
@@ -2,9 +2,6 @@
 Description=CSR popup service for user session
 
 [Service]
-@DECLARE_POPUP_USER@
-@DECLARE_POPUP_GROUP@
-@DECLARE_POPUP_SMACK_PROCESS_LABEL@
 Type=simple
 EnvironmentFile=@POPUP_SERVICE_ENV_FILE_PATH@
 ExecStart=@BIN_DIR@/@SERVICE_NAME@-popup

diff --git a/systemd/csr-popup.service.old.in b/systemd/csr-popup.service.old.in
new file mode 100644 (file)
index 0000000..10ec73a
--- /dev/null
+++ b/systemd/csr-popup.service.old.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=CSR popup service for user session
+
+[Service]
+User=app
+Group=app
+SmackProcessLabel=@SMACK_DOMAIN_NAME@
+Type=simple
+EnvironmentFile=@POPUP_SERVICE_ENV_FILE_PATH@
+ExecStart=@BIN_DIR@/@SERVICE_NAME@-popup
+Sockets=@SERVICE_NAME@-popup.socket

diff --git a/systemd/csr-popup.socket.in b/systemd/csr-popup.socket.in
index 5ac7642..a360f66 100644 (file)
--- a/systemd/csr-popup.socket.in
+++ b/systemd/csr-popup.socket.in
@@ -7,8 +7,6 @@ Before=@SERVICE_NAME@-popup.service
 ListenStream=/tmp/.@SERVICE_NAME@-popup.socket
 Service=@SERVICE_NAME@-popup.service
 SocketMode=0777
-SmackLabelIPIn=*
-SmackLabelIPOut=@
 
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/csr-popup.socket.old.in b/systemd/csr-popup.socket.old.in
new file mode 100644 (file)
index 0000000..5ac7642
--- /dev/null
+++ b/systemd/csr-popup.socket.old.in
@@ -0,0 +1,14 @@
+[Unit]
+Description= Csr popup socket
+Wants=@SERVICE_NAME@-popup.service
+Before=@SERVICE_NAME@-popup.service
+
+[Socket]
+ListenStream=/tmp/.@SERVICE_NAME@-popup.socket
+Service=@SERVICE_NAME@-popup.service
+SocketMode=0777
+SmackLabelIPIn=*
+SmackLabelIPOut=@
+
+[Install]
+WantedBy=sockets.target