From 417958954826d55ae5ca6462ea3095b9cd72bedb Mon Sep 17 00:00:00 2001 From: Blindauer Emmanuel Date: Fri, 24 Jul 2015 08:49:12 +0200 Subject: [PATCH] Add default directory for debian, and set them optional Remove the --nodaemon which makes the service fail at start --- instfiles/xrdp-sesman.service | 3 ++- instfiles/xrdp.service | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/instfiles/xrdp-sesman.service b/instfiles/xrdp-sesman.service index 69882783..0ce9a4e5 100644 --- a/instfiles/xrdp-sesman.service +++ b/instfiles/xrdp-sesman.service @@ -7,7 +7,8 @@ BindTo=xrdp.service [Service] Type=forking PIDFile=/var/run/xrdp-sesman.pid -EnvironmentFile=/etc/sysconfig/xrdp +EnvironmentFile=-/etc/sysconfig/xrdp +EnvironmentFile=-/etc/default/xrdp ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill diff --git a/instfiles/xrdp.service b/instfiles/xrdp.service index 843500d6..fca4bd66 100644 --- a/instfiles/xrdp.service +++ b/instfiles/xrdp.service @@ -6,8 +6,9 @@ After=syslog.target network.target xrdp-sesman.service [Service] Type=forking PIDFile=/var/run/xrdp.pid -EnvironmentFile=/etc/sysconfig/xrdp -ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon +EnvironmentFile=-/etc/sysconfig/xrdp +EnvironmentFile=-/etc/default/xrdp +ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill [Install]