blob: 3fb11d258000e3c591d8a7715694385ea1f6808e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
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
@@ -7,10 +7,8 @@ After=network.target 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
+ExecStart=@sbindir@/xrdp
+ExecStop=@sbindir@/xrdp --kill
[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
@@ -8,10 +8,8 @@ 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
+ExecStart=@sbindir@/xrdp-sesman
+ExecStop=@sbindir@/xrdp-sesman --kill
[Install]
WantedBy=multi-user.target
diff -up src/xrdp-devel-git/instfiles/xrdp.sh.orig src/xrdp-devel-git/instfiles/xrdp.sh
--- src/xrdp-devel-git/instfiles/xrdp.sh.orig 2017-08-30 00:27:28.000000000 -0600
+++ src/xrdp-devel-git/instfiles/xrdp.sh 2017-08-30 00:28:00.000000000 -0600
@@ -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-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()
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
pre_start
|