From 753f664541c84f1977f370690e38d9130bf9e2f1 Mon Sep 17 00:00:00 2001
From: Mike Sul <ext-mykhaylo.sul@here.com>
Date: Fri, 17 May 2019 10:58:30 +0300
Subject: OTA-2541: Remove Secondary's socket service. Use a regular systemd
 service to start Seconadry daemon

Signed-off-by: Mike Sul <ext-mykhaylo.sul@here.com>
---
 recipes-sota/aktualizr/aktualizr_git.bb                  | 5 +----
 recipes-sota/aktualizr/files/aktualizr-secondary.service | 6 +++++-
 recipes-sota/aktualizr/files/aktualizr-secondary.socket  | 6 ------
 3 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 recipes-sota/aktualizr/files/aktualizr-secondary.socket

diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index db8cf38..d61b597 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -22,7 +22,6 @@ SRC_URI = " \
   file://run-ptest \
   file://aktualizr.service \
   file://aktualizr-secondary.service \
-  file://aktualizr-secondary.socket \
   file://aktualizr-serialcan.service \
   file://10-resource-control.conf \
   ${@ d.expand("https://ats-tuf-cli-releases.s3-eu-central-1.amazonaws.com/cli-${GARAGE_SIGN_PV}.tgz;unpack=0") if d.getVar('GARAGE_SIGN_AUTOVERSION') != '1' else ''} \
@@ -45,7 +44,7 @@ PTEST_ENABLED = "0"
 
 SYSTEMD_PACKAGES = "${PN} ${PN}-secondary"
 SYSTEMD_SERVICE_${PN} = "aktualizr.service"
-SYSTEMD_SERVICE_${PN}-secondary = "aktualizr-secondary.socket"
+SYSTEMD_SERVICE_${PN}-secondary = "aktualizr-secondary.service"
 
 EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DAKTUALIZR_VERSION=${PV} ${@bb.utils.contains('PTEST_ENABLED', '1', '-DTESTSUITE_VALGRIND=on', '', d)}"
 
@@ -100,7 +99,6 @@ do_install_append () {
     install -m 0644 ${S}/config/sota_secondary.toml ${D}/${libdir}/sota/sota_secondary.toml
     install -m 0644 ${S}/config/sota_uboot_env.toml ${D}/${libdir}/sota/sota_uboot_env.toml
     install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/aktualizr-secondary.socket ${D}${systemd_unitdir}/system/aktualizr-secondary.socket
     install -m 0644 ${WORKDIR}/aktualizr-secondary.service ${D}${systemd_unitdir}/system/aktualizr-secondary.service
     install -m 0700 -d ${D}${libdir}/sota/conf.d
     install -m 0700 -d ${D}${sysconfdir}/sota/conf.d
@@ -184,7 +182,6 @@ FILES_${PN}-examples = " \
 FILES_${PN}-secondary = " \
                 ${bindir}/aktualizr-secondary \
                 ${libdir}/sota/sota_secondary.toml \
-                ${systemd_unitdir}/system/aktualizr-secondary.socket \
                 ${systemd_unitdir}/system/aktualizr-secondary.service \
                 "
 
diff --git a/recipes-sota/aktualizr/files/aktualizr-secondary.service b/recipes-sota/aktualizr/files/aktualizr-secondary.service
index 9628ee3..b577ae8 100644
--- a/recipes-sota/aktualizr/files/aktualizr-secondary.service
+++ b/recipes-sota/aktualizr/files/aktualizr-secondary.service
@@ -1,8 +1,12 @@
 [Unit]
 Description=Aktualizr SOTA Client (UPTANE Secondary)
+After=network.target
 
 [Service]
 RestartSec=10
 Restart=always
-ExecStart=/usr/bin/aktualizr-secondary --config /usr/lib/sota/sota_secondary.toml
+ExecStart=/usr/bin/aktualizr-secondary
+
+[Install]
+WantedBy=multi-user.target
 
diff --git a/recipes-sota/aktualizr/files/aktualizr-secondary.socket b/recipes-sota/aktualizr/files/aktualizr-secondary.socket
deleted file mode 100644
index da0ee44..0000000
--- a/recipes-sota/aktualizr/files/aktualizr-secondary.socket
+++ /dev/null
@@ -1,6 +0,0 @@
-[Socket]
-ListenStream=9030
-ListenDatagram=9031
-
-[Install]
-WantedBy=sockets.target
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf