Modify tef-simulator service and socket to start at boot.

Bind service and socket to each other to stop one when use stop other.

Change-Id: Ib94f4eb99508f6165df3cba40b333f2180a2bf9f

diff --git a/packaging/tef-simulator.spec b/packaging/tef-simulator.spec
index 3ce274c20cbfacf8e2beb15fd8a614bc0966949d..1f34aef63749cf5fa5c6d23049ca17d6bc1dc7e4 100644 (file)
--- a/packaging/tef-simulator.spec
+++ b/packaging/tef-simulator.spec
@@ -114,7 +114,6 @@ fi
 %{lib_dir}/libtef-simulator-ssflib.so
 %attr(770,root,security_fw) %{tastore_dir}
 %attr(444,security_fw,security_fw) %{_unitdir}/tef-simulator.service
-%attr(444,security_fw,security_fw) %{_unitdir}/tef-simulator.target
 %attr(444,security_fw,security_fw) %{_unitdir}/tef-simulator.socket
 
 %files -n %{name}-client

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 40e4602babd709a01b8714de6044b150de1884d7..57f288dd69d04de08a1583c707ff19736bbaf4a7 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -22,7 +22,6 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/systemd/tef-simulator.service.in
 
 INSTALL(FILES
     ${CMAKE_SOURCE_DIR}/systemd/tef-simulator.service
-    ${CMAKE_SOURCE_DIR}/systemd/tef-simulator.target
     ${CMAKE_SOURCE_DIR}/systemd/tef-simulator.socket
     DESTINATION
     ${SYSTEMD_UNIT_DIR}

diff --git a/systemd/tef-simulator.service.in b/systemd/tef-simulator.service.in
index 85496a0bcfb5c9c9d44ed5e5a8f732c290c1c0e7..85a3efa718903e5b7c215989c726a2193b70b2ee 100644 (file)
--- a/systemd/tef-simulator.service.in
+++ b/systemd/tef-simulator.service.in
@@ -1,6 +1,7 @@
 [Unit]
 Description=TEF Simulator Daemon
 DefaultDependencies=no
+BindsTo=tef-simulator.socket
 
 [Service]
 User=security_fw
@@ -8,7 +9,6 @@ Group=security_fw
 CapabilityBoundingSet=
 SmackProcessLabel=@SMACK_DOMAIN_NAME@
 ExecStart=@SYSTEMD_CFG_BIN_DIR@/tef-simulator-daemon
-Sockets=tef-simulator.socket
 RuntimeDirectory=@SERVICE_NAME@
 
 [Install]

diff --git a/systemd/tef-simulator.socket b/systemd/tef-simulator.socket
index 0551f60ee0fbb615f88c47acddd93e4537db22e8..09ecd71d6e95487b745fb6ff7cc960066e0a9bfe 100644 (file)
--- a/systemd/tef-simulator.socket
+++ b/systemd/tef-simulator.socket
@@ -4,11 +4,8 @@ SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@
 
-Service=tef-simulator.service
-
 [Unit]
-Wants=tef-simulator.target
-Before=tef-simulator.target
+BindsTo=tef-simulator.service
 
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/tef-simulator.target b/systemd/tef-simulator.target
deleted file mode 100644 (file)
index e7be849..0000000
--- a/systemd/tef-simulator.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=TEF Simulator socket
-DefaultDependencies=true
-