summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Sdun <frederik_sdun@mentor.com>2016-01-12 14:18:48 +0100
committerLutz Helwing <lutz_helwing@mentor.com>2016-01-27 16:52:11 +0100
commit0ba40225900d3e43700f467d06db0978d3f46a7c (patch)
tree74b43e4538e2485e5b6e80da1f47325fcb27aea1
parentba46036d828fcd5f79ab7609025007b3dba46aee (diff)
downloadDLT-daemon-0ba40225900d3e43700f467d06db0978d3f46a7c.tar.gz
Add systemd install dir parameter
Add option to specify user for non root processes Change-Id: I8055695c9653e3a52a3838d20e4be87ef5de3972 Signed-off-by: Lutz Helwing <lutz_helwing@mentor.com>
-rw-r--r--CMakeLists.txt4
-rw-r--r--systemd/CMakeLists.txt2
-rw-r--r--systemd/dlt-adaptor-udp.service.cmake2
-rw-r--r--systemd/dlt-example-user.service.cmake2
-rw-r--r--systemd/dlt-receive.service.cmake2
-rwxr-xr-x[-rw-r--r--]systemd/dlt-system.service.cmake2
-rwxr-xr-x[-rw-r--r--]systemd/dlt.service.cmake2
7 files changed, 10 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eaf35a1..c3838dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,6 +68,8 @@ option(WITH_DLT_EXAMPLES "Set to ON to build src/examples binaries"
option(WITH_DLT_SYSTEM "Set to ON to build src/system binaries" ON)
option(WITH_DLT_DBUS "Set to ON to build src/dbus binaries" ON)
option(WITH_DLT_TESTS "Set to ON to build src/test binaries" ON)
+option(WITH_DLT_USER "Set user for process not run as root" genivi)
+option(SYSTEMD_UNITDIR "Set directory to install systemd unit files" ${CMAKE_INSTALL_PREFIX}/lib/systemd/system)
option(WITH_DLT_CXX11_EXT "Set to ON to build C++11 extensions" OFF)
option(WITH_DLT_COREDUMPHANDLER "EXPERIMENTAL! Set to ON to build src/core_dump_handler binaries. EXPERIMENTAL" OFF)
option(WITH_DLT_LOGSTORAGE_CTRL_UDEV "PROTOTYPE! Set to ON to build logstorage control application with udev support" OFF)
@@ -194,6 +196,8 @@ message( STATUS "Build for Version ${DLT_VERSION} build ${DLT_REVISION} version
message( STATUS "WITH_SYSTEMD = ${WITH_SYSTEMD}" )
message( STATUS "WITH_SYSTEMD_WATCHDOG = ${WITH_SYSTEMD_WATCHDOG}" )
message( STATUS "WITH_SYSTEMD_JOURNAL = ${WITH_SYSTEMD_JOURNAL}" )
+message( STATUS "SYSTEMD_UNITDIR = ${SYSTEMD_UNITDIR}" )
+message( STATUS "WITH_DLT_USER = ${WITH_DLT_USER}" )
message( STATUS "WITH_DOC = ${WITH_DOC}" )
message( STATUS "WITH_MAN = ${WITH_MAN}" )
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
index c5e4860..646734d 100644..100755
--- 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
index fba7ec5..257cc3d 100644..100755
--- 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