diff options
Diffstat (limited to 'pcr/xrdp/arch-config.diff')
| -rw-r--r-- | pcr/xrdp/arch-config.diff | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/pcr/xrdp/arch-config.diff b/pcr/xrdp/arch-config.diff new file mode 100644 index 000000000..d67e16e77 --- /dev/null +++ b/pcr/xrdp/arch-config.diff @@ -0,0 +1,71 @@ +diff -up src/xrdp-0.9.1/instfiles/xrdp.service.orig src/xrdp-0.9.1/instfiles/xrdp.service +--- src/xrdp-0.9.1/instfiles/xrdp.service.orig 2016-12-22 10:02:47.000000000 -0700 ++++ src/xrdp-0.9.1/instfiles/xrdp.service 2017-01-07 00:55:16.000000000 -0700 +@@ -6,10 +6,8 @@ After=syslog.target network.target xrdp- + [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 ++ExecStart=/usr/bin/xrdp ++ExecStop=/usr/bin/xrdp --kill + + [Install] + WantedBy=multi-user.target +diff -up src/xrdp-0.9.1/instfiles/xrdp-sesman.service.orig src/xrdp-0.9.1/instfiles/xrdp-sesman.service +--- src/xrdp-0.9.1/instfiles/xrdp-sesman.service.orig 2016-12-22 10:02:47.000000000 -0700 ++++ src/xrdp-0.9.1/instfiles/xrdp-sesman.service 2017-01-07 00:55:54.000000000 -0700 +@@ -2,15 +2,13 @@ + Description=xrdp session manager + After=syslog.target network.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 ++ExecStart=/usr/bin/xrdp-sesman ++ExecStop=/usr/bin/xrdp-sesman --kill + + [Install] + WantedBy=multi-user.target +diff -up src/xrdp-0.9.1/instfiles/xrdp.sh.orig src/xrdp-0.9.1/instfiles/xrdp.sh +--- src/xrdp-0.9.1/instfiles/xrdp.sh.orig 2016-12-22 09:56:24.000000000 -0700 ++++ src/xrdp-0.9.1/instfiles/xrdp.sh 2017-01-07 00:55:16.000000000 -0700 +@@ -17,7 +17,7 @@ + # Description: starts xrdp + ### END INIT INFO + +-SBINDIR=/usr/local/sbin ++SBINDIR=/usr/bin + LOG=/dev/null + CFGDIR=/etc/xrdp + +diff -up src/xrdp-0.9.1/sesman/startwm.sh.orig src/xrdp-0.9.1/sesman/startwm.sh +--- src/xrdp-0.9.1/sesman/startwm.sh.orig 2016-12-22 10:02:47.000000000 -0700 ++++ src/xrdp-0.9.1/sesman/startwm.sh 2017-01-07 00:55:16.000000000 -0700 +@@ -8,6 +8,17 @@ wm_start() + export LANG LANGUAGE + fi + ++ # arch user ++ if [ -r ~/.xinitrc ]; then ++ . ~/.xinitrc ++ exit 0 ++ fi ++ # arch ++ if [ -r /etc/X11/xinit/xinitrc ]; then ++ . /etc/X11/xinit/xinitrc ++ exit 0 ++ fi ++ + # debian + if [ -r /etc/X11/Xsession ]; then + . /etc/X11/Xsession |