diff options
Diffstat (limited to 'arch-config.diff')
| -rw-r--r-- | arch-config.diff | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/arch-config.diff b/arch-config.diff index 655de09eaa37..946f25866ac2 100644 --- a/arch-config.diff +++ b/arch-config.diff @@ -1,6 +1,6 @@ -diff -up src/xrdp-devel-git/instfiles/xrdp.service.in.orig src/xrdp-devel-git/instfiles/xrdp.service.in ---- src/xrdp-devel-git/instfiles/xrdp.service.in.orig 2017-08-30 00:30:33.000000000 -0600 -+++ src/xrdp-devel-git/instfiles/xrdp.service.in 2017-08-30 00:31:08.000000000 -0600 +diff -up src/xrdp-git/instfiles/xrdp.service.in.orig src/xrdp-git/instfiles/xrdp.service.in +--- src/xrdp-git/instfiles/xrdp.service.in.orig 2021-05-12 17:14:14.530000000 -0600 ++++ src/xrdp-git/instfiles/xrdp.service.in 2021-05-12 17:14:15.300000000 -0600 @@ -7,10 +7,8 @@ After=network.target xrdp-sesman.service [Service] Type=forking @@ -14,9 +14,9 @@ diff -up src/xrdp-devel-git/instfiles/xrdp.service.in.orig src/xrdp-devel-git/in [Install] WantedBy=multi-user.target -diff -up src/xrdp-devel-git/instfiles/xrdp-sesman.service.in.orig src/xrdp-devel-git/instfiles/xrdp-sesman.service.in ---- src/xrdp-devel-git/instfiles/xrdp-sesman.service.in.orig 2017-08-30 00:31:39.000000000 -0600 -+++ src/xrdp-devel-git/instfiles/xrdp-sesman.service.in 2017-08-30 00:32:25.000000000 -0600 +diff -up src/xrdp-git/instfiles/xrdp-sesman.service.in.orig src/xrdp-git/instfiles/xrdp-sesman.service.in +--- src/xrdp-git/instfiles/xrdp-sesman.service.in.orig 2021-05-12 17:14:14.530000000 -0600 ++++ src/xrdp-git/instfiles/xrdp-sesman.service.in 2021-05-12 17:14:15.310000000 -0600 @@ -8,10 +8,8 @@ BindsTo=xrdp.service [Service] Type=forking @@ -30,21 +30,37 @@ diff -up src/xrdp-devel-git/instfiles/xrdp-sesman.service.in.orig src/xrdp-devel [Install] WantedBy=multi-user.target -diff -up src/xrdp-devel-git/sesman/startwm.sh.orig src/xrdp-devel-git/sesman/startwm.sh ---- src/xrdp-devel-git/sesman/startwm.sh.orig 2017-08-30 00:27:30.000000000 -0600 -+++ src/xrdp-devel-git/sesman/startwm.sh 2017-08-30 00:28:00.000000000 -0600 -@@ -56,6 +56,17 @@ wm_start() +diff -up src/xrdp-git/sesman/sesman.ini.in.orig src/xrdp-git/sesman/sesman.ini.in +--- src/xrdp-git/sesman/sesman.ini.in.orig 2021-05-12 17:14:14.880000000 -0600 ++++ src/xrdp-git/sesman/sesman.ini.in 2021-05-12 17:15:56.580000000 -0600 +@@ -94,7 +94,7 @@ EnableSyslog=true + ; CentOS 7 : param=/usr/bin/Xorg or param=Xorg + ; CentOS 8 : param=/usr/libexec/Xorg + ; +-param=Xorg ++param=/usr/lib/Xorg + ; Leave the rest paramaters as-is unless you understand what will happen. + param=-config + param=xrdp/xorg.conf +diff -up src/xrdp-git/sesman/startwm.sh.orig src/xrdp-git/sesman/startwm.sh +--- src/xrdp-git/sesman/startwm.sh.orig 2021-05-12 17:14:14.890000000 -0600 ++++ src/xrdp-git/sesman/startwm.sh 2021-05-12 17:14:15.310000000 -0600 +@@ -63,6 +63,21 @@ wm_start() export LANG LANGUAGE fi + # arch user + if [ -r ~/.xinitrc ]; then ++ pre_start + . ~/.xinitrc ++ post_start + exit 0 + fi + # arch + if [ -r /etc/X11/xinit/xinitrc ]; then ++ pre_start + . /etc/X11/xinit/xinitrc ++ post_start + exit 0 + fi + |