blob: 8bc8e9d6bb048bf753c8077f33fe526ec4e79e9b (
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-git/instfiles/xrdp.service.orig src/xrdp-git/instfiles/xrdp.service
--- src/xrdp-git/instfiles/xrdp.service.orig 2015-12-04 06:23:12.000000000 -0700
+++ src/xrdp-git/instfiles/xrdp.service 2015-12-04 06:28:25.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-git/instfiles/xrdp-sesman.service.orig src/xrdp-git/instfiles/xrdp-sesman.service
--- src/xrdp-git/instfiles/xrdp-sesman.service.orig 2015-12-04 06:23:12.000000000 -0700
+++ src/xrdp-git/instfiles/xrdp-sesman.service 2015-12-04 06:28:19.000000000 -0700
@@ -7,10 +7,8 @@ BindTo=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-git/instfiles/xrdp.sh.orig src/xrdp-git/instfiles/xrdp.sh
--- src/xrdp-git/instfiles/xrdp.sh.orig 2015-12-04 06:23:08.000000000 -0700
+++ src/xrdp-git/instfiles/xrdp.sh 2015-12-04 06:23:12.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-git/sesman/startwm.sh.orig src/xrdp-git/sesman/startwm.sh
--- src/xrdp-git/sesman/startwm.sh.orig 2015-12-04 06:23:09.000000000 -0700
+++ src/xrdp-git/sesman/startwm.sh 2015-12-04 06:23:12.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
|