pool/xrdp
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 787829 from home:qkzhu:branches:X11:RemoteDesktop

Browse Source 
- Update xrdp-bsc965647-allow-admin-choose-desktop.patch: 
  + Set the default session to GNOME Session for SLE.
  + Update the variables to launch SLE-Classic Session.
  (bsc#1166746).

- Update xrdp-bsc965647-allow-admin-choose-desktop.patch: 
  Add `export XDG_SESSION_TYPE=x11` in startwm.sh for SLE, since 
  lacking this variable in GNOME 3.34 causes GNOME crash (bsc#1159257).

OBS-URL: https://build.opensuse.org/request/show/787829
OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=78
This commit is contained in:
Tomáš Chvátal
2020-03-24 14:55:46 +00:00
committed by Git OBS Bridge
parent 5b4994f3f8
commit c61a88543a
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
xrdp-bsc965647-allow-admin-choose-desktop.patch
View File

@@ -1,8 +1,8 @@
Index: b/sesman/startwm.sh diff --git a/sesman/startwm.sh b/sesman/startwm.sh
=================================================================== index ad06010..2330775 100755
--- a/sesman/startwm.sh 2018-03-28 12:58:02.408758661 +0800 --- a/sesman/startwm.sh
+++ b/sesman/startwm.sh 2018-03-28 12:59:03.058439975 +0800 +++ b/sesman/startwm.sh
@@ -7,34 +7,63 @@ @@ -7,34 +7,66 @@
# exec xterm # exec xterm
@@ -26,18 +26,21 @@ Index: b/sesman/startwm.sh
+wm_start() +wm_start()
+{ +{
+ #Customize your preferred session mode here + #Customize your preferred session mode here
+ SESSION="sle" + #The default session is gnome(GNOME Session)
+ #sle means SLE-Classic Session
+ SESSION="gnome"
+ +
+ case $SESSION in + case $SESSION in
+ sle) + sle)
+ if [ -r /usr/bin/gnome-session ]; then + if [ -r /usr/bin/gnome-session ]; then
+ export GNOME_SHELL_SESSION_MODE=classic + export XDG_SESSION_TYPE=x11
+ export SLE_CLASSIC_MODE=1 + export GNOME_SHELL_SESSION_MODE=sle-classic
+ /usr/bin/gnome-session --session gnome-classic + /usr/bin/gnome-session --session gnome-classic
+ fi + fi
+ ;; + ;;
+ gnome) + gnome)
+ if [ -r /usr/bin/gnome-session ]; then + if [ -r /usr/bin/gnome-session ]; then
+ export XDG_SESSION_TYPE=x11
+ /usr/bin/gnome-session + /usr/bin/gnome-session
+ fi + fi
+ ;; + ;;
@@ -86,7 +89,7 @@ Index: b/sesman/startwm.sh
. ~/.profile . ~/.profile
fi fi
fi fi
@@ -42,56 +71,20 @@ @@ -42,56 +74,20 @@ pre_start()
return 0 return 0
} }
@@ -150,7 +153,7 @@ Index: b/sesman/startwm.sh
#. /etc/environment #. /etc/environment
#export PATH=$PATH #export PATH=$PATH
#export LANG=$LANG #export LANG=$LANG
@@ -106,6 +99,8 @@ @@ -106,6 +102,8 @@ wm_start()
# includes # includes
# auth required pam_env.so readenv=1 # auth required pam_env.so readenv=1

15
xrdp.changes
View File

@@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Mar 24 14:30:55 UTC 2020 - QK ZHU <qkzhu@suse.com>
- Update xrdp-bsc965647-allow-admin-choose-desktop.patch:
+ Set the default session to GNOME Session for SLE.
+ Update the variables to launch SLE-Classic Session.
(bsc#1166746).
-------------------------------------------------------------------
Tue Mar 24 14:25:20 UTC 2020 - QK ZHU <qkzhu@suse.com>
- Update xrdp-bsc965647-allow-admin-choose-desktop.patch:
Add `export XDG_SESSION_TYPE=x11` in startwm.sh for SLE, since
lacking this variable in GNOME 3.34 causes GNOME crash (bsc#1159257).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 12 03:43:01 UTC 2020 - Felix Zhang <fzhang.foss@gmail.com> Thu Mar 12 03:43:01 UTC 2020 - Felix Zhang <fzhang.foss@gmail.com>