This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit da350c91c5c2e2d9f60c6fb853386de052485c85 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 27 08:18:38 2019 +0100 minidesktop/ltsp/: Make x2gothinclient-minidesktop work on top of latest LTSP (tested with 19.11). --- debian/x2gothinclient-minidesktop.install | 1 + ...ent-minidesktop_disable-ltsp-display-manager.sh | 31 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/debian/x2gothinclient-minidesktop.install b/debian/x2gothinclient-minidesktop.install index 59c253b..27b6033 100644 --- a/debian/x2gothinclient-minidesktop.install +++ b/debian/x2gothinclient-minidesktop.install @@ -6,3 +6,4 @@ minidesktop/etc/restart.lightdm etc/lightdm/ minidesktop/desktop/x2gothinclient-*.desktop usr/share/applications/ minidesktop/schema-overrides/* usr/share/glib-2.0/schemas/ minidesktop/mate-panel-layout/* usr/share/mate-panel/layouts/ +minidesktop/ltsp/* usr/share/ltsp/ diff --git a/minidesktop/ltsp/client/init/60-x2gothinclient-minidesktop_disable-ltsp-display-manager.sh b/minidesktop/ltsp/client/init/60-x2gothinclient-minidesktop_disable-ltsp-display-manager.sh new file mode 100644 index 0000000..df1c8b9 --- /dev/null +++ b/minidesktop/ltsp/client/init/60-x2gothinclient-minidesktop_disable-ltsp-display-manager.sh @@ -0,0 +1,31 @@ +# Copyright (C) 2007-2018 X2Go Project - https://wiki.x2go.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2011-2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + +# This file is not part of LTSP, https://ltsp.github.io, but extends it + +# On X2Go Mini Desktop Thin Clients, the display manager (LightDM) gets +# configured via the x2gothinclient-minidesktop package and does not require +# tweaking by LTSP. +# In fact, the LTSP display manager tweaks break the way the X2Go TCE adapts +# the LightDM configuration. So let's disable the display_manager_main() +# function of LTSP, entirely. + +display_manager_main() { + return 0 +} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git