48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
diff -ruN xrdp-0.9.4-v/instfiles/xrdp.service.in xrdp-0.9.4/instfiles/xrdp.service.in
|
|
--- xrdp-0.9.4-v/instfiles/xrdp.service.in 2017-07-19 14:23:49.000000000 +1000
|
|
+++ xrdp-0.9.4/instfiles/xrdp.service.in 2017-10-06 14:29:13.910973750 +1100
|
|
@@ -2,15 +2,11 @@
|
|
Description=xrdp daemon
|
|
Documentation=man:xrdp(8) man:xrdp.ini(5)
|
|
Requires=xrdp-sesman.service
|
|
-After=network.target xrdp-sesman.service
|
|
+After=xrdp-sesman.service
|
|
|
|
[Service]
|
|
-Type=forking
|
|
-PIDFile=@localstatedir@/run/xrdp.pid
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/xrdp
|
|
-EnvironmentFile=-@sysconfdir@/default/xrdp
|
|
-ExecStart=@sbindir@/xrdp $XRDP_OPTIONS
|
|
-ExecStop=@sbindir@/xrdp $XRDP_OPTIONS --kill
|
|
+EnvironmentFile=@sysconfdir@/sysconfig/xrdp
|
|
+ExecStart=@sbindir@/xrdp $XRDP_OPTIONS --nodaemon
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|
|
diff -ruN xrdp-0.9.4-v/instfiles/xrdp-sesman.service.in xrdp-0.9.4/instfiles/xrdp-sesman.service.in
|
|
--- xrdp-0.9.4-v/instfiles/xrdp-sesman.service.in 2017-07-19 14:23:49.000000000 +1000
|
|
+++ xrdp-0.9.4/instfiles/xrdp-sesman.service.in 2017-10-06 14:29:13.910973750 +1100
|
|
@@ -1,17 +1,14 @@
|
|
[Unit]
|
|
Description=xrdp session manager
|
|
Documentation=man:xrdp-sesman(8) man:sesman.ini(5)
|
|
-After=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
|
|
BindsTo=xrdp.service
|
|
|
|
[Service]
|
|
-Type=forking
|
|
-PIDFile=@localstatedir@/run/xrdp-sesman.pid
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/xrdp
|
|
-EnvironmentFile=-@sysconfdir@/default/xrdp
|
|
-ExecStart=@sbindir@/xrdp-sesman $SESMAN_OPTIONS
|
|
-ExecStop=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --kill
|
|
+EnvironmentFile=@sysconfdir@/sysconfig/xrdp
|
|
+ExecStart=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --nodaemon
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|