[X2Go-Commits] [x2gothinclient] 02/02: x2gothinclient-<TC-FLAVOUR>_start: Drop requirement of having symlink /etc/x2go/x2gothinclient_start. Now all code passages that use the _start wrapper, use the x2gothinclient-<TC-FLAVOUR>_start file directly.

git-admin at x2go.org git-admin at x2go.org
Fri Nov 23 22:18:24 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit 2adfc55bed5e2693188457a69c21f5da3a25d06d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 23 22:16:59 2018 +0100

    x2gothinclient-<TC-FLAVOUR>_start: Drop requirement of having symlink /etc/x2go/x2gothinclient_start. Now all code passages that use the _start wrapper, use the x2gothinclient-<TC-FLAVOUR>_start file directly.
---
 debian/changelog                                       | 3 +++
 displaymanager/init/x2gothinclient-displaymanager.init | 2 +-
 displaymanager/sbin/x2gothinclientd                    | 2 +-
 management/README                                      | 2 +-
 management/man/x2gothinclient_update.8                 | 6 +++---
 management/sbin/x2gothinclient_update                  | 1 -
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4eca880..06e68d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,6 +77,9 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low
     - x2gothinclient_sessions: Provide RDP-Direct session profile example that
       utilizes FreeRDPv2 rather than deprecated FreeRDPv1.x. (On Debian stretch,
       it is recommended to use FreeRDPv2 from Debian stretch-backports).
+    - x2gothinclient-<TC-FLAVOUR>_start: Drop requirement of having symlink
+      /etc/x2go/x2gothinclient_start. Now all code passages that use the _start
+      wrapper, use the x2gothinclient-<TC-FLAVOUR>_start file directly.
   * debian/control:
     + Rename bin:package: x2gothinclient -> x2gothinclient-daemon.
     + Make sure x2gothinclient-minidesktop pulls in X11 and X2Go Client.
diff --git a/displaymanager/init/x2gothinclient-displaymanager.init b/displaymanager/init/x2gothinclient-displaymanager.init
index d429cde..822d6c9 100644
--- a/displaymanager/init/x2gothinclient-displaymanager.init
+++ b/displaymanager/init/x2gothinclient-displaymanager.init
@@ -46,7 +46,7 @@ NAME=x2gothinclient
 DESC="X2Go Thinclient Display Manager"
 
 test -x $DAEMON || exit 0
-if [ ! -x /etc/x2go/x2gothinclient_init ] || [ ! -x /etc/x2go/x2gothinclient_start ]; then
+if [ ! -x /etc/x2go/x2gothinclient_init ] || [ ! -x /etc/x2go/x2gothinclient-displaymanager_start ]; then
 	echo "X2Go Thin Client system will not start as it is not configured, yet."
 	echo "See https://wiki.x2go.org/doku.php/wiki:advanced:tce:install"
 	exit 0
diff --git a/displaymanager/sbin/x2gothinclientd b/displaymanager/sbin/x2gothinclientd
index cc223f0..bfe49f4 100755
--- a/displaymanager/sbin/x2gothinclientd
+++ b/displaymanager/sbin/x2gothinclientd
@@ -198,7 +198,7 @@ print F "#!/bin/bash
 . /etc/X11/Xsession.d/95dbus_update-activation-env
   set -e\n";
 			close (F);
-			qx(cat /etc/x2go/x2gothinclient_start >> /tmp/startwrap);
+			qx(cat /etc/x2go/x2gothinclient-displaymanager_start >> /tmp/startwrap);
 			chmod(0755, "/tmp/startwrap");
 			qx(su - x2gothinclient -c \"export DISPLAY=:0; /tmp/startwrap 1>/dev/null 2>/dev/null\");
 		}
diff --git a/management/README b/management/README
index 3658e30..9ac43fa 100644
--- a/management/README
+++ b/management/README
@@ -32,6 +32,6 @@ files
 Files needed to adjust the runtime system.
 
 /etc/x2go/x2gothinclient_init
-/etc/x2go/x2gothinclient_start
+/etc/x2go/x2gothinclient-<TC-FLAVOUR>_start
 /etc/x2go/x2gothinclient_sessions
 /etc/x2go/x2goclient-background.svg
diff --git a/management/man/x2gothinclient_update.8 b/management/man/x2gothinclient_update.8
index 75314b1..f1ab4d9 100644
--- a/management/man/x2gothinclient_update.8
+++ b/management/man/x2gothinclient_update.8
@@ -27,9 +27,9 @@ This helper script updates the configuration of an X2Go thin client chroot envir
 /usr/share/x2go/tce/x2gothinclient_init
     Script that prepares tmpfs filespace on X2Go thin client startup.
 
-/usr/share/x2go/tce/x2gothinclient_start
-    Script that launches and configures x2goclient in desktop manager
-    mode.
+/usr/share/x2go/tce/x2gothinclient-<TC-FLAVOUR>_start
+    Script that launches and configures x2goclient in display manager or mini-desktop
+    mode (where <TC-FLAVOUR can either be "displaymanager" or "minidesktop").
 
 /usr/share/x2go/tce/x2gothinclient_sessions
     Session profiles for x2goclient if running in non-LDAP mode.
diff --git a/management/sbin/x2gothinclient_update b/management/sbin/x2gothinclient_update
index bf2637e..b3a0afa 100755
--- a/management/sbin/x2gothinclient_update
+++ b/management/sbin/x2gothinclient_update
@@ -73,7 +73,6 @@ done
 if test -f "$TC_CONFIG/x2gothinclient-${TC_FLAVOUR}_start"; then
 	cp -v "$TC_CONFIG/x2gothinclient-${TC_FLAVOUR}_start" "$TC_CHROOT/etc/x2go/x2gothinclient-${TC_FLAVOUR}_start"
 	chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient-${TC_FLAVOUR}_start"
-	ln -sf "/etc/x2go/x2gothinclient-${TC_FLAVOUR}_start" "$TC_CHROOT/etc/x2go/x2gothinclient_start"
 fi
 
 if test -f "$TC_CONFIG/x2gothinclient_sessions"; then

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git


More information about the x2go-commits mailing list