From c3dcd60b18df6cc9a089654a3a0adfe298c1b7d7 Mon Sep 17 00:00:00 2001
From: Minh Quang Luu <50074497+minminlittleshrimp@users.noreply.github.com>
Date: Wed, 8 May 2024 16:57:33 +0700
Subject: [PATCH] systemd: Correct service files relationship (#575)

+ Remove unusual relationship and replace with multi-user
+ Avoid dlt conflict on shutdown when applying no dependency

Co-authored-by: Gianfranco Costamagna <1227338+LocutusOfBorg@users.noreply.github.com>
---
 systemd/dlt-dbus.service.cmake   | 3 +--
 systemd/dlt-system.service.cmake | 2 +-
 systemd/dlt.service.cmake        | 6 +++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/systemd/dlt-dbus.service.cmake b/systemd/dlt-dbus.service.cmake
index ee41ec815..40186e46e 100644
--- a/systemd/dlt-dbus.service.cmake
+++ b/systemd/dlt-dbus.service.cmake
@@ -27,5 +27,4 @@ NotifyAccess=main
 LimitCORE=infinity
 
 [Install]
-WantedBy=basic.target
-
+WantedBy=multi-user.target
diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake
index ac170990d..83226cf1d 100755
--- a/systemd/dlt-system.service.cmake
+++ b/systemd/dlt-system.service.cmake
@@ -27,5 +27,5 @@ NotifyAccess=main
 LimitCORE=infinity
 
 [Install]
-WantedBy=basic.target
+WantedBy=multi-user.target
 
diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake
index a19fa7e6d..411858f70 100755
--- a/systemd/dlt.service.cmake
+++ b/systemd/dlt.service.cmake
@@ -16,6 +16,10 @@
 [Unit]
 Description=COVESA DLT logging daemon
 Documentation=man:dlt-daemon(1) man:dlt.conf(5)
+DefaultDependencies=no
+Before=shutdown.target
+Conflicts=shutdown.target
+After=tmp.mount
 
 [Service]
 Type=simple
@@ -26,4 +30,4 @@ NotifyAccess=main
 LimitCORE=infinity
 
 [Install]
-WantedBy=basic.target
+WantedBy=multi-user.target