Add back a couple of patches:

Service files fixes and dependencies.
Sesman default configuration.
This commit is contained in:
Bojan Smojver 2015-07-17 11:01:18 +10:00
parent 310bc7685a
commit db390059b0
2 changed files with 94 additions and 0 deletions

42
xrdp-0.9.0-service.patch Normal file
View File

@ -0,0 +1,42 @@
diff -ruN xrdp-0.9.0-vanilla/instfiles/xrdp.service xrdp-0.9.0/instfiles/xrdp.service
--- xrdp-0.9.0-vanilla/instfiles/xrdp.service 2015-07-15 07:17:49.000000000 +1000
+++ xrdp-0.9.0/instfiles/xrdp.service 2015-07-17 10:19:19.000000000 +1000
@@ -1,14 +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
-ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
-ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
+ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
[Install]
WantedBy=multi-user.target
diff -ruN xrdp-0.9.0-vanilla/instfiles/xrdp-sesman.service xrdp-0.9.0/instfiles/xrdp-sesman.service
--- xrdp-0.9.0-vanilla/instfiles/xrdp-sesman.service 2015-07-15 07:17:49.000000000 +1000
+++ xrdp-0.9.0/instfiles/xrdp-sesman.service 2015-07-17 10:19:46.000000000 +1000
@@ -1,14 +1,13 @@
[Unit]
Description=xrdp session manager
-After=syslog.target network.target
+BindsTo=xrdp.service
+Wants=network-online.target nss-lookup.target nss-user-lookup.target
+After=network-online.target nss-lookup.target nss-user-lookup.target
StopWhenUnneeded=true
[Service]
-Type=forking
-PIDFile=/var/run/xrdp-sesman.pid
EnvironmentFile=/etc/sysconfig/xrdp
-ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
-ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
+ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --nodaemon
[Install]
WantedBy=multi-user.target

52
xrdp-0.9.0-sesman.patch Normal file
View File

@ -0,0 +1,52 @@
diff -ruN xrdp-0.9.0-vanilla/sesman/sesman.ini xrdp-0.9.0/sesman/sesman.ini
--- xrdp-0.9.0-vanilla/sesman/sesman.ini 2015-07-15 07:17:49.000000000 +1000
+++ xrdp-0.9.0/sesman/sesman.ini 2015-07-17 10:25:13.449024694 +1000
@@ -3,7 +3,7 @@
ListenPort=3350
EnableUserWindowManager=1
UserWindowManager=startwm.sh
-DefaultWindowManager=startwm.sh
+DefaultWindowManager=startwm-bash.sh
[Security]
AllowRootLogin=1
@@ -64,19 +64,17 @@
[X11rdp]
param1=-bs
-param2=-ac
-param3=-nolisten
-param4=tcp
-param5=-uds
+param2=-nolisten
+param3=tcp
+param4=-uds
[Xvnc]
param1=-bs
-param2=-ac
-param3=-nolisten
-param4=tcp
-param5=-localhost
-param6=-dpi
-param7=96
+param2=-nolisten
+param3=tcp
+param4=-localhost
+param5=-dpi
+param6=96
[Xorg]
param1=-config
@@ -84,9 +82,8 @@
param3=-logfile
param4=/dev/null
param5=-noreset
-param6=-ac
-param7=-nolisten
-param8=tcp
+param6=-nolisten
+param7=tcp
[Chansrv]
# drive redirection, defaults to xrdp_client if not set