[debian-edu-commits] debian-edu/pkg-team/ 156/159: Looking at the systemd docs again, Type=forking is correct.

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit b9545fd274154f67ccb9c512559fe22b779c510a
Author: Dominik George <nik at naturalnet.de>
Date:   Thu Sep 3 00:38:05 2015 +0200

    Looking at the systemd docs again, Type=forking is correct.
    
    „If set to simple […], its communication channels should be installed
    before the daemon is started up (e.g. sockets set up by systemd […]).“
---
 patches/systemd.diff | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/patches/systemd.diff b/patches/systemd.diff
index e9b8775..6e57b8d 100644
--- a/patches/systemd.diff
+++ b/patches/systemd.diff
@@ -2,7 +2,7 @@
 
 --- a/instfiles/xrdp-sesman.service
 +++ b/instfiles/xrdp-sesman.service
-@@ -1,14 +1,12 @@
+@@ -1,13 +1,12 @@
  [Unit]
 -Description=xrdp session manager
 -After=syslog.target network.target
@@ -13,19 +13,17 @@
 +After=network.target xrdp.service
  
  [Service]
--Type=forking
+ Type=forking
 -PIDFile=/var/run/xrdp-sesman.pid
 -EnvironmentFile=/etc/sysconfig/xrdp
--ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
-+Type=simple
 +EnvironmentFile=/etc/default/xrdp
-+ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --nodaemon
++PIDFile=/run/xrdp/xrdp-sesman.pid
+ ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
  ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
  
- [Install]
 --- a/instfiles/xrdp.service
 +++ b/instfiles/xrdp.service
-@@ -1,14 +1,17 @@
+@@ -1,14 +1,18 @@
  [Unit]
 -Description=xrdp daemon
 -Requires=xrdp-sesman.service
@@ -34,16 +32,17 @@
 +After=network.target
  
  [Service]
--Type=forking
+ Type=forking
 -PIDFile=/var/run/xrdp.pid
 -EnvironmentFile=/etc/sysconfig/xrdp
-+Type=simple
+-ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
 +EnvironmentFile=/etc/default/xrdp
++PIDFile=/run/xrdp/xrdp.pid
 +User=xrdp
 +Group=xrdp
 +PermissionsStartOnly=true
 +ExecStartPre=/bin/sh /usr/share/xrdp/socksetup
- ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
++ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
  ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
 +ExecStopPost=/bin/rm -rf /var/run/xrdp/sockdir
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git