[X2Go-Commits] x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-82-gaaba851

X2Go dev team git-admin at x2go.org
Sat Mar 30 00:17:20 CET 2013


The branch, wheezy-tce has been updated
       via  aaba851450b69d66ebd3bfd2e79e7f7892f5d9e1 (commit)
       via  72b928a147fbe6b7765cc1b94bc74f6fe98a8553 (commit)
       via  6e6ebae510f6fdf0c547e9908e5e471cc9e05a14 (commit)
       via  55b9ba6b3223f5aec50c3b0c18250efd17f93f3c (commit)
       via  d20dbbf856a33a6598d071f88760c8a313a49b99 (commit)
       via  4b41fef0d1a8ab3f060b2d30af8ba97ffb13e677 (commit)
       via  c4779a149fab738ac6039141ffad034d8f59bfea (commit)
       via  c11cd7def5185eeb6b71a8affc0dec942d6d608d (commit)
       via  885ca4507532e2987462b4b7fde34bcad56565bc (commit)
       via  29891a012b85d6c8e8ea283c8fe469f2f3763feb (commit)
       via  cbd735c414b251daf4cc7ee1b9b81aa640744215 (commit)
      from  3556daf2eeffa81046d247320d41673595571be3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    2 +
 debian/control                                     |   27 ++++---
 debian/x2gocdmanager.init                          |   79 ++++++++------------
 debian/x2gothinclient.init                         |   62 +++++++--------
 debian/x2gothinclient.install                      |    1 +
 debian/x2gothinclient.postinst                     |   26 +++----
 x2gothinclient/sbin/x2gothinclientd                |    2 +-
 .../sbin/x2gothinclient_create                     |    1 +
 8 files changed, 95 insertions(+), 105 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3e59550..29492d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,6 +66,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
     + Fix lintian issue: debian-rules-missing-recommended-target build-indep
   * /debian/x2gothinclient.examples:
     + Fix src location of example config files.
+  * /debian/x2gothinclient.install:
+    + Install TCE config files into /etc/x2go by default.
   * /debian/x2gothinclientmanagement.manpages:
     + Make sure all man pages for bin:package x2gothinclientmanagement get
       installed into package.
diff --git a/debian/control b/debian/control
index bdb0917..e7942e8 100644
--- a/debian/control
+++ b/debian/control
@@ -31,8 +31,9 @@ Description: Management tools for X2Go thin client chroot server
  X2Go is a server based computing environment with
     - session resuming
     - low bandwidth support
-    - LDAP support
-    - client side mass storage mounting support
+    - session broker support
+    - client-side mass storage mounting support
+    - client-side printing support
     - audio support
     - authentication by smartcard and USB stick
  .
@@ -54,7 +55,6 @@ Depends:
  xauth,
  xinit,
  locales,
- plymouth,
 Recommends:
  x2gocdmanager,
  x2gousbmount,
@@ -68,6 +68,7 @@ Recommends:
  memtest86+,
  x11-xserver-utils,
 Suggests:
+ plymouth,
  plymouth-themes-all
 Breaks:
  x2gothinshutdown
@@ -77,8 +78,9 @@ Description: login daemon starting x2goclient in displaymanager mode
  X2Go is a server based computing environment with
     - session resuming
     - low bandwidth support
-    - LDAP support
-    - client side mass storage mounting support
+    - session broker support
+    - client-side mass storage mounting support
+    - client-side printing support
     - audio support
     - authentication by smartcard and USB stick
  .
@@ -105,8 +107,9 @@ Description: clientside usb mass-storage device mounting
  X2Go is a server based computing environment with
     - session resuming
     - low bandwidth support
-    - LDAP support
-    - client side mass storage mounting support
+    - session broker support
+    - client-side mass storage mounting support
+    - client-side printing support
     - audio support
     - authentication by smartcard and USB stick
  .
@@ -131,8 +134,9 @@ Description: clientside daemon enabling automatic CD-Rom mounting
  X2Go is a server based computing environment with
     - session resuming
     - low bandwidth support
-    - LDAP support
-    - client side mass storage mounting support
+    - session broker support
+    - client-side mass storage mounting support
+    - client-side printing support
     - audio support
     - authentication by smartcard and USB stick
  .
@@ -153,8 +157,9 @@ Description: UDEV rules for smartcard readers
  X2Go is a server based computing environment with
     - session resuming
     - low bandwidth support
-    - LDAP support
-    - client side mass storage mounting support
+    - session broker support
+    - client-side mass storage mounting support
+    - client-side printing support
     - audio support
     - authentication by smartcard and USB stick
  .
diff --git a/debian/x2gocdmanager.init b/debian/x2gocdmanager.init
index a7d6e8a..d759d30 100644
--- a/debian/x2gocdmanager.init
+++ b/debian/x2gocdmanager.init
@@ -29,6 +29,16 @@
 # Short-Description: Start and stop the x2go CD/DVD manager daemon
 ### END INIT INFO
 
+set -e
+
+# use system's locale settings for the X2Go Client in TCE mode
+if [ -r /etc/default/locale ]; then
+	. /etc/default/locale
+	export LANG LANGUAGE
+fi
+
+. /lib/lsb/init-functions
+
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 export HOSTNAME
 DAEMON=/usr/sbin/x2gocdmanager
@@ -37,60 +47,31 @@ DESC=x2gocdmanager
 
 test -x $DAEMON || exit 0
 
-
-set -e
-
 case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON -- $DAEMON_OPTS
-	echo "$NAME."
+	start)
+		log_daemon_msg "Starting $DESC" "x2gocdmanager"
+		start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+		log_end_msg $?
 	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid || true
-	
-	echo "$NAME."
+	stop)
+		log_daemon_msg "Stopping $DESC" "x2gocdmanager"
+		start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid || true
+		log_end_msg $?
 	;;
-  #reload)
-	#
-	#	If the daemon can reload its config files on the fly
-	#	for example by sending it SIGHUP, do it here.
-	#
-	#	If the daemon responds to changes in its config file
-	#	directly anyway, make this a do-nothing entry.
-	#
-	# echo "Reloading $DESC configuration files."
-	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	#	/var/run/$NAME.pid --exec $DAEMON
-  #;;
-  force-reload)
-	#
-	#	If the "reload" option is implemented, move the "force-reload"
-	#	option to the "reload" entry above. If not, "force-reload" is
-	#	just the same as "restart" except that it does nothing if the
-	#   daemon isn't already running.
-	# check wether $DAEMON is running. If so, restart
-	start-stop-daemon --stop --test --quiet --pidfile \
-		/var/run/$NAME.pid  \
-	&& $0 restart \
-	|| exit 0
+	force-reload)
+		start-stop-daemon --stop --test --quiet --pidfile /var/run/$NAME.pid && $0 restart || exit 0
 	;;
-  restart)
-    echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --quiet --pidfile \
-		/var/run/$NAME.pid 
-	sleep 1
-	start-stop-daemon --start --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
-	echo "$NAME."
+	restart)
+		log_daemon_msg "Restarting $DESC" "x2gocdmanager"
+		start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid
+		sleep 1
+		start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+		log_end_msg $?
 	;;
-  *)
-	N=/etc/init.d/$NAME
-	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
+	*)
+		N=/etc/init.d/$NAME
+		echo "Usage: $N {start|stop|restart|force-reload}" >&2
+		exit 1
 	;;
 esac
 
diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init
index 56b817b..cbfd047 100644
--- a/debian/x2gothinclient.init
+++ b/debian/x2gothinclient.init
@@ -48,7 +48,7 @@ DESC="X2Go Thinclient Service"
 test -x $DAEMON || exit 0
 if [ ! -x /etc/x2go/x2gothinclient_init ] || [ ! -x /etc/x2go/x2gothinclient_start ]; then
 	echo "X2Go Thin Client system will not start as it is not configured, yet."
-	echo "See http://wiki.x2go.org/doku.php/wiki:components:tce"
+	echo "See http://wiki.x2go.org/doku.php/wiki:advanced:tce:install"
 	exit 0
 fi
 
@@ -61,40 +61,40 @@ HEED_DEFAULT_DISPLAY_MANAGER=${HEED_DEFAULT_DISPLAY_MANAGER:-true}
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
 case "$1" in
-  start)
-	CONFIGURED_DAEMON="$(basename \"$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)\")"
-	if grep -wqs text /proc/cmdline; then
-		log_warning_msg "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline."
-	elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \
-	    [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \
-	    [ "$CONFIGURED_DAEMON" != x2gothinclientd ] ; then
-		log_action_msg "Not starting X2Go Client in TCE mode; it is not configured as default display manager"
-	else
-		log_daemon_msg "Starting $DESC" "x2gothinclientd"
-		start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
-		log_end_msg $?
-	fi
+	start)
+		CONFIGURED_DAEMON="$(basename $(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null))"
+		if grep -wqs text /proc/cmdline; then
+			log_warning_msg "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline."
+		elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \
+		    [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \
+		    [ "$CONFIGURED_DAEMON" != "x2gothinclientd" ] ; then
+			log_action_msg "Not starting X2Go Client in TCE mode; it is not configured as default display manager"
+		else
+			log_daemon_msg "Starting $DESC" "x2gothinclientd"
+			start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+			log_end_msg $?
+		fi
 	;;
-  stop)
-	if [ -e /var/run/$NAME.pid ]; then
-		log_daemon_msg "Stopping $DESC" "x2gothinclientd"
-		start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid && echo "$NAME." || echo "not running"
-		log_end_msg $?
-	fi
+	stop)
+		if [ -e /var/run/$NAME.pid ]; then
+			log_daemon_msg "Stopping $DESC" "x2gothinclientd"
+			start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid && echo "$NAME." || echo "not running"
+			log_end_msg $?
+		fi
 	;;
-  force-reload)
-	# check wether $DAEMON is running. If so, restart
-	start-stop-daemon --stop --test --quiet --pidfile /var/run/$NAME.pid && $0 restart || exit 0
+	force-reload)
+		# check wether $DAEMON is running. If so, restart
+		start-stop-daemon --stop --test --quiet --pidfile /var/run/$NAME.pid && $0 restart || exit 0
 	;;
-  restart)
-	$0 stop
-	sleep 1
-	$0 start
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
 	;;
-  *)
-	N=/etc/init.d/$NAME
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
+	*)
+		N=/etc/init.d/$NAME
+		echo "Usage: $N {start|stop|restart|force-reload}" >&2
+		exit 1
 	;;
 esac
 
diff --git a/debian/x2gothinclient.install b/debian/x2gothinclient.install
index 8684f90..ee7f973 100644
--- a/debian/x2gothinclient.install
+++ b/debian/x2gothinclient.install
@@ -1 +1,2 @@
 x2gothinclient/sbin/x2gothinclientd         usr/sbin/
+x2gothinclientmanagement/share/etc/* etc/x2go/
diff --git a/debian/x2gothinclient.postinst b/debian/x2gothinclient.postinst
index be096ce..4b8aa0d 100755
--- a/debian/x2gothinclient.postinst
+++ b/debian/x2gothinclient.postinst
@@ -77,19 +77,19 @@ case "$1" in
 			if getent group cdrom 1>/dev/null; then adduser x2gothinclient cdrom; fi
 			if getent group plugdev 1>/dev/null; then adduser x2gothinclient plugdev; fi
 			if ! getent group scard 1>/dev/null; then groupadd --system scard; fi
-			if getent group scard 1>/dev/null; then adduser x2goclient scard; fi
-                else
-                        echo "User x2gothinclient already exists." >&2
-                fi
-                ;;
-
-        abort-upgrade|abort-remove|abort-deconfigure)
-                ;;
-
-        *)
-                echo "postinst called with unknown argument \`$1'" >&2
-                exit 1
-                ;;
+			if getent group scard 1>/dev/null; then adduser x2gothinclient scard; fi
+		else
+			echo "User x2gothinclient already exists." >&2
+		fi
+		;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+		;;
+
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 1
+		;;
 esac
 
 # dh_installdeb will replace this with shell code automatically
diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd
index 3ccb7d8..088137e 100755
--- a/x2gothinclient/sbin/x2gothinclientd
+++ b/x2gothinclient/sbin/x2gothinclientd
@@ -94,7 +94,7 @@ elsif ($pid == 0 )
 	while(sleep 1)
 	{
 		# test if shutdown button on X2Go Client was clicked
-		if (-e expand_file("~x2gothinclient/.halt"))
+		if (-e expand_filename("~x2gothinclient/.halt"))
 		{
 			# when used with plymouth, make sure we stay on the correct terminal
 			system("killall Xorg");
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index 75edd56..72de25e 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -189,6 +189,7 @@ export X2GO_HANDLE_DAEMONS=false
 [ \$? -eq 0 ] && sed -e 's/#ListenAddress ::/AddressFamily inet\nListenAddress 127.0.0.1/' -i /etc/ssh/sshd_config
 
 # tweak plymouth
+[ \$? -eq 0 ] && apt-get install plymouth plymouth-themes-all -y
 [ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$TC_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$TC_PRETTY_NAME" >> /etc/os-release
 [ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf
 [ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf


hooks/post-receive
-- 
x2gothinclient.git (X2Go Thin Client Environment)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gothinclient.git" (X2Go Thin Client Environment).




More information about the x2go-commits mailing list