[debian-edu-commits] debian-edu/pkg-team/ 108/159: gah, just run the sesman in foreground, too

[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 57cb5eb5a37f8b36bef4e7bd7101686aa1f665f7
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Aug 26 23:40:29 2015 +0200

    gah, just run the sesman in foreground, too
---
 patches/systemd.diff | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/patches/systemd.diff b/patches/systemd.diff
index e9e6574..c6f4ef5 100644
--- a/patches/systemd.diff
+++ b/patches/systemd.diff
@@ -2,7 +2,7 @@
 
 --- a/instfiles/xrdp-sesman.service
 +++ b/instfiles/xrdp-sesman.service
-@@ -1,13 +1,14 @@
+@@ -1,14 +1,15 @@
  [Unit]
 -Description=xrdp session manager
 -After=syslog.target network.target
@@ -12,15 +12,18 @@
  BindTo=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
 +PIDFile=/var/run/xrdp/xrdp-sesman.pid
 +EnvironmentFile=/etc/default/xrdp
 +RuntimeDirectory=/run/xrdp
- ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
++ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --nodaemon
  ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
  
+ [Install]
 --- a/instfiles/xrdp.service
 +++ b/instfiles/xrdp.service
 @@ -1,12 +1,13 @@

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