metalefty/xrdp-next
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Restore patch for *.service files

Browse Source 
Thanks to Bojan Smojver.
This commit is contained in:
Pavel Roskin 2017-01-22 11:58:17 -08:00
parent ab7b4e9cce
commit 66c205af73
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
xrdp-0.9.1-service.patch Normal file
View File

@ -0,0 +1,47 @@
diff -ur xrdp-0.9.1/instfiles/xrdp.service xrdp-0.9.1.service/instfiles/xrdp.service
--- xrdp-0.9.1/instfiles/xrdp.service 2016-12-22 09:02:47.000000000 -0800
+++ xrdp-0.9.1.service/instfiles/xrdp.service 2017-01-19 23:35:06.000000000 -0800
@@ -1,15 +1,11 @@
[Unit]
Description=xrdp daemon
Requires=xrdp-sesman.service
-After=syslog.target network.target xrdp-sesman.service
+After=xrdp-sesman.service
[Service]
-Type=forking
-PIDFile=/var/run/xrdp.pid
-EnvironmentFile=-/etc/sysconfig/xrdp
-EnvironmentFile=-/etc/default/xrdp
-ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
-ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
+EnvironmentFile=/etc/sysconfig/xrdp
+ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
[Install]
WantedBy=multi-user.target
diff -ur xrdp-0.9.1/instfiles/xrdp-sesman.service xrdp-0.9.1.service/instfiles/xrdp-sesman.service
--- xrdp-0.9.1/instfiles/xrdp-sesman.service 2016-12-22 09:02:47.000000000 -0800
+++ xrdp-0.9.1.service/instfiles/xrdp-sesman.service 2017-01-22 11:39:23.000000000 -0800
@@ -1,16 +1,13 @@
[Unit]
Description=xrdp session manager
-After=syslog.target network.target
+Wants=network-online.target nss-lookup.target nss-user-lookup.target
+After=network-online.target nss-lookup.target nss-user-lookup.target
StopWhenUnneeded=true
-BindTo=xrdp.service
+BindsTo=xrdp.service
[Service]
-Type=forking
-PIDFile=/var/run/xrdp-sesman.pid
-EnvironmentFile=-/etc/sysconfig/xrdp
-EnvironmentFile=-/etc/default/xrdp
-ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
-ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
+EnvironmentFile=/etc/sysconfig/xrdp
+ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --nodaemon
[Install]
WantedBy=multi-user.target

1
xrdp.spec
View File

@ -12,6 +12,7 @@ Source2: xrdp.sysconfig
Source3: xrdp.logrotate Source3: xrdp.logrotate
Patch0: xrdp-0.9.1-sesman.patch Patch0: xrdp-0.9.1-sesman.patch
Patch1: xrdp-0.9.1-xrdp-ini.patch Patch1: xrdp-0.9.1-xrdp-ini.patch
Patch2: xrdp-0.9.1-service.patch
Buildrequires: libX11-devel Buildrequires: libX11-devel
BuildRequires: libXfixes-devel BuildRequires: libXfixes-devel