[xrdp] Make xrdp-sesman.service stop when not needed by xrdp.service. Also try to restart xrdp-sesman.servi

bojan bojan at fedoraproject.org
Fri May 25 22:54:17 UTC 2012


commit 182f0e85f2bfc8b83f1b5a7ec5d33c5f6d4011c2
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Sat May 26 08:53:12 2012 +1000

    Make xrdp-sesman.service stop when not needed by xrdp.service.
    Also try to restart xrdp-sesman.service.
    Just restarting xrdp.service not enough.

 xrdp-sesman.service |    1 +
 xrdp.spec           |    8 +++++++-
 2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/xrdp-sesman.service b/xrdp-sesman.service
index a602e78..d40150c 100644
--- a/xrdp-sesman.service
+++ b/xrdp-sesman.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=xrdp session manager
 After=syslog.target network.target
+StopWhenUnneeded=true
 
 [Service]
 Type=forking
diff --git a/xrdp.spec b/xrdp.spec
index 85cc2fd..00b6169 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -1,7 +1,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.6.0
-Release:   0.2%{?dist}
+Release:   0.3%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -118,6 +118,7 @@ fi
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
 # Package upgrade, not uninstall
+    /bin/systemctl try-restart xrdp-sesman.service >/dev/null 2>&1 || :
     /bin/systemctl try-restart xrdp.service >/dev/null 2>&1 || :
 fi
 
@@ -129,6 +130,7 @@ fi
 
 # Run these because the SysV package being removed won't do them
 /sbin/chkconfig --del xrdp >/dev/null 2>&1 || :
+/bin/systemctl try-restart xrdp-sesman.service >/dev/null 2>&1 || :
 /bin/systemctl try-restart xrdp.service >/dev/null 2>&1 || :
 
 
@@ -177,6 +179,10 @@ fi
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Sat May 26 2012 Bojan Smojver <bojan at rexursive.com> - 0.6.0-0.3
+- also attempt to restart xrdp-sesman.service (just xrdp.service won't do it)
+- stop xrdp-sesman.service when not needed by xrdp.service
+
 * Fri May 25 2012 Bojan Smojver <bojan at rexursive.com> - 0.6.0-0.2
 - bump release for rebuild with the correct e-mail address
 


More information about the scm-commits mailing list