X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-ivi-common%2Frecipes-extended%2Fdlt-daemon%2Fdlt-daemon%2F0002-Don-t-execute-processes-as-a-specific-user.patch;h=168847990c42b305958241a716c4eb2136acda14;hb=99804790f0954fc2cf0d20aa4d0a581361d3cfe6;hp=40c5afbeb8b76831b8d322a4bf427f866a9b8f3d;hpb=be9762b38b7b8608350ac391368cf88ce5906864;p=AGL%2Fmeta-agl.git

diff --git a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch b/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch
index 40c5afbeb..168847990 100644
--- a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch
+++ b/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch
@@ -7,85 +7,75 @@ Upstream-Status: Inappropriate [Configuration Specific]
 Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
 ---
  systemd/dlt-adaptor-udp.service.cmake  | 1 -
- systemd/dlt-dbus.service.cmake         | 1 -
  systemd/dlt-example-user.service.cmake | 1 -
  systemd/dlt-receive.service.cmake      | 1 -
  systemd/dlt-system.service.cmake       | 1 -
  systemd/dlt.service.cmake              | 1 -
- 6 files changed, 6 deletions(-)
+ 5 files changed, 5 deletions(-)
 
 diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake
-index 0c39637..f446757 100644
+index 8dac1f2..ecf9f9e 100644
 --- a/systemd/dlt-adaptor-udp.service.cmake
 +++ b/systemd/dlt-adaptor-udp.service.cmake
-@@ -20,7 +20,6 @@ Wants=dlt.service
+@@ -21,9 +21,8 @@ Wants=dlt.service
  
  [Service]
- Type=Simple
--User=genivi
+ Type=simple
+-User=@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-dbus.service.cmake b/systemd/dlt-dbus.service.cmake
-index 2727c2d..d1e3b12 100755
---- a/systemd/dlt-dbus.service.cmake
-+++ b/systemd/dlt-dbus.service.cmake
-@@ -21,7 +21,6 @@ Wants=dlt.service
- 
- [Service]
- Type=Simple
--User=root
- ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-dbus
- WatchdogSec=@DLT_WatchdogSec@
- NotifyAccess=main
+ [Install]
+-WantedBy=multi-user.target
+\ No newline at end of file
++WantedBy=multi-user.target
 diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake
-index 3652292..b67a83c 100644
+index b665742..35009b0 100644
 --- a/systemd/dlt-example-user.service.cmake
 +++ b/systemd/dlt-example-user.service.cmake
-@@ -20,6 +20,5 @@ Wants=dlt.service
+@@ -21,6 +21,5 @@ Wants=dlt.service
  
  [Service]
- Type=Simple
--User=genivi
+ Type=simple
+-User=@DLT_USER@
  ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application"
- LimitCORE=infinity
+-LimitCORE=infinity
 \ No newline at end of file
++LimitCORE=infinity
 diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake
-index b92c8b2..4bbdfc2 100644
+index c07d447..8f88f00 100644
 --- a/systemd/dlt-receive.service.cmake
 +++ b/systemd/dlt-receive.service.cmake
-@@ -21,6 +21,5 @@ Wants=dlt.service
+@@ -22,6 +22,5 @@ Wants=dlt.service
  
  [Service]
- Type=Simple
--User=genivi
+ Type=simple
+-User=@DLT_USER@
  ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-receive -o /tmp/dlt_receive_log.dlt localhost
- LimitCORE=infinity
+-LimitCORE=infinity
 \ No newline at end of file
++LimitCORE=infinity
 diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake
-index f5e844b..7ec995c 100755
+index 0e91f42..1a5b913 100755
 --- a/systemd/dlt-system.service.cmake
 +++ b/systemd/dlt-system.service.cmake
-@@ -21,7 +21,6 @@ Wants=dlt.service
- 
- [Service]
- Type=Simple
--User=genivi
- ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-system
- WatchdogSec=@DLT_WatchdogSec@
- NotifyAccess=main
+@@ -22,7 +22,6 @@ Wants=dlt.service
+ 
+ [Service]
+ Type=simple
+-User=@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 22279c4..7bb05bc 100755
+index 0b3ee2c..e4753a2 100755
 --- a/systemd/dlt.service.cmake
 +++ b/systemd/dlt.service.cmake
-@@ -20,7 +20,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5)
+@@ -21,7 +21,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5)
  
  [Service]
- Type=Simple
--User=genivi
+ Type=simple
+-User=@DLT_USER@
  ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-daemon
  WatchdogSec=@DLT_WatchdogSec@
  NotifyAccess=main
--- 
-1.9.3
-