From 0ba40225900d3e43700f467d06db0978d3f46a7c Mon Sep 17 00:00:00 2001 From: Frederik Sdun Date: Tue, 12 Jan 2016 14:18:48 +0100 Subject: Add systemd install dir parameter Add option to specify user for non root processes Change-Id: I8055695c9653e3a52a3838d20e4be87ef5de3972 Signed-off-by: Lutz Helwing --- systemd/CMakeLists.txt | 2 +- systemd/dlt-adaptor-udp.service.cmake | 2 +- systemd/dlt-example-user.service.cmake | 2 +- systemd/dlt-receive.service.cmake | 2 +- systemd/dlt-system.service.cmake | 2 +- systemd/dlt.service.cmake | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) mode change 100644 => 100755 systemd/dlt-system.service.cmake mode change 100644 => 100755 systemd/dlt.service.cmake (limited to 'systemd') diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt index d37880d..fd050b0 100644 --- a/systemd/CMakeLists.txt +++ b/systemd/CMakeLists.txt @@ -17,7 +17,7 @@ if(WITH_SYSTEMD) - set(SYSTEMD_CONFIGURATIONS_FILES_DIR ${CMAKE_INSTALL_PREFIX}/lib/systemd/system ) + set(SYSTEMD_CONFIGURATIONS_FILES_DIR ${SYSTEMD_UNITDIR} ) if(WITH_SYSTEMD_WATCHDOG) set( DLT_WatchdogSec 2 ) diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake index 8e7fc28..89dcbb1 100644 --- a/systemd/dlt-adaptor-udp.service.cmake +++ b/systemd/dlt-adaptor-udp.service.cmake @@ -21,7 +21,7 @@ Wants=dlt.service [Service] Type=Simple -User=genivi +User=@WITH_DLT_USER@ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-adaptor-udp -a @DLT_ADAPTOR_UDP_APPID@ -c @DLT_ADAPTOR_UDP_CTID@ -p @DLT_ADAPTOR_UDP_PORT@ LimitCORE=infinity diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake index 3bf18e6..cf6927e 100644 --- a/systemd/dlt-example-user.service.cmake +++ b/systemd/dlt-example-user.service.cmake @@ -21,6 +21,6 @@ Wants=dlt.service [Service] Type=Simple -User=genivi +User=@WITH_DLT_USER@ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application" LimitCORE=infinity \ No newline at end of file diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake index 02b51e5..79af6d8 100644 --- a/systemd/dlt-receive.service.cmake +++ b/systemd/dlt-receive.service.cmake @@ -22,6 +22,6 @@ Wants=dlt.service [Service] Type=Simple -User=genivi +User=@WITH_DLT_USER@ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-receive -o /tmp/dlt_receive_log.dlt localhost LimitCORE=infinity \ No newline at end of file diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake old mode 100644 new mode 100755 index c5e4860..646734d --- a/systemd/dlt-system.service.cmake +++ b/systemd/dlt-system.service.cmake @@ -22,7 +22,7 @@ Wants=dlt.service [Service] Type=Simple -User=genivi +User=@WITH_DLT_USER@ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-system WatchdogSec=@DLT_WatchdogSec@ NotifyAccess=main diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake old mode 100644 new mode 100755 index fba7ec5..257cc3d --- a/systemd/dlt.service.cmake +++ b/systemd/dlt.service.cmake @@ -21,7 +21,7 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5) [Service] Type=Simple -User=genivi +User=@WITH_DLT_USER@ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-daemon WatchdogSec=@DLT_WatchdogSec@ NotifyAccess=main -- cgit v1.2.1