xrdp/xrdp-bsc965647-allow-admin-choose-desktop.patch
Dirk Mueller f047e239d0 Accepting request 423916 from home:zhangxiaofei:branches:X11:RemoteDesktop
- Add xrdp-disable-8-bpp-vnc-support.patch:
  Disable 8 bpp vnc support. Xvnc drops support for 8 bpp since
  1.4.0. Trying to launch Xvnc in 8 bpp will cause it to dump core
  (bsc#991059).
- Add obs source services:
  + tar_scm
  + recompress
  + set_version
- Update to version 0.9.0~git.1456906198.f422461:
  Fix tarball naming from 0.9.0git to 0.9.0~git to conform openSUSE
  naming scheme for pre-release version.
  + Numlock out of sync fix
  + neutrinordp: minor changes, coding style, log level
  + Update faq-compile.txt
  + Change to allow authentication against all authentication
    methods.
  + Add details for crypt_level=fips to man page
  + libxrdp: no logic change, tabs to spaces
  + libxrdp: opps, fix typeo
  + Fix "\ _" on jp keyboard
  + xrdp_keyboard.ini: Fix jp keyboard model
  + update xorgxrdp
  + add keyboard options to xrdp_client_info
  + xorgxrdp=68412e5
- Add an extra legacy service action force_stop:
  Forcefully killing xrdp processes when it cannot be stopped
  normally.
  Usage:
    $ service xrdp force_stop
    or

OBS-URL: https://build.opensuse.org/request/show/423916
OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=5
2016-09-21 11:37:09 +00:00

69 lines
1.5 KiB
Diff

From b14f40d4567b884623936a8b3c20350d1ea37ffd Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezhang@suse.com>
Date: Mon, 1 Aug 2016 17:55:35 +0800
Subject: [PATCH] bsc#965647 allow admin choose desktop
---
sesman/startwm.sh | 44 +++++++++++++++++++++-----------------------
1 file changed, 21 insertions(+), 23 deletions(-)
diff --git a/sesman/startwm.sh b/sesman/startwm.sh
index ee48263..ace62a0 100755
--- a/sesman/startwm.sh
+++ b/sesman/startwm.sh
@@ -3,30 +3,28 @@
#start the window manager
wm_start()
{
- if [ -r /etc/default/locale ]; then
- . /etc/default/locale
- export LANG LANGUAGE
- fi
-
- # debian
- if [ -r /etc/X11/Xsession ]; then
- . /etc/X11/Xsession
- exit 0
- fi
-
- # el
- if [ -r /etc/X11/xinit/Xsession ]; then
- . /etc/X11/xinit/Xsession
- exit 0
- fi
+ #Customize your preferred session mode here
+ SESSION="sle"
- # suse
- if [ -r /etc/X11/xdm/Xsession ]; then
- . /etc/X11/xdm/Xsession
- exit 0
- fi
-
- xterm
+ case $SESSION in
+ sle)
+ if [ -r /usr/bin/gnome-session ]; then
+ export GNOME_SHELL_SESSION_MODE=classic
+ export SLE_CLASSIC_MODE=1
+ /usr/bin/gnome-session --session gnome-classic
+ fi
+ ;;
+ gnome)
+ if [ -r /usr/bin/gnome-session ]; then
+ /usr/bin/gnome-session
+ fi
+ ;;
+ icewm)
+ if [ -r /usr/bin/icewm-session ]; then
+ /usr/bin/icewm-session
+ fi
+ ;;
+ esac
}
#Execution sequence for interactive login shell
--
2.6.6