summarylogtreecommitdiffstats
path: root/arch-config.diff
blob: f72336b7dc2dd874cdbc7fd6f9a52a4e077118c2 (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
diff -up src/xrdp/sesman/startwm.sh.orig src/xrdp/sesman/startwm.sh
--- src/xrdp/sesman/startwm.sh.orig	2020-12-28 07:03:43.000000000 -0700
+++ src/xrdp/sesman/startwm.sh	2021-05-12 17:06:31.690000000 -0600
@@ -75,11 +75,26 @@ get_xdg_session_startupcmd()
 #start the window manager
 wm_start()
 {
-  if [ -r /etc/default/locale ]; then
-    . /etc/default/locale
+  if [ -r /etc/locale.conf ]; then
+    . /etc/locale.conf
     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
+
   # debian
   if [ -r /etc/X11/Xsession ]; then
     pre_start