x2go-commits November 2013

x2go-commits@lists.x2go.org

2 participants
391 discussions

x2gothinclient.git - build-main (branch) updated: 1.1.0.0-23-g277b1f7
by git-admin＠x2go.org 22 Nov '13

22 Nov '13

The branch, build-main has been updated via 277b1f779a3d6b0f3a11fc7c4ad5b32dc16ac169 (commit) from d31612857aa5d01ed112f5f3c4cc4c1fee209ddc (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/… [View More]changelog | 3 +++ debian/control | 2 +- .../share/etc/x2gothinclient_start | 5 ++--- 3 files changed, 6 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 395b45c..7ca3a8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,10 +17,13 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low avoid failures when clean tmp files on the read-only NFS root-fs. - Work around Debian bug #729373 during TCE creation. Patch alsa-utils init script and ALSA's utils.sh. + - Refrain from using "~<user>" when launching X2Go Client as it cannot + handle it, yet. Use "~" instead (handable by X2Go Client >= 4.0.1.2). * debian/control: + New bin:package x2gothinclient-chroot. + Make sure x2gothinclient-chroot pulls in editing tools like mc, vim, less via Recommends: field. + + Depend on x2goclient (>= 4.0.1.2-0~). [ Arnold Krille ] * New upstream version (1.1.0.1): diff --git a/debian/control b/debian/control index 4e0f7a7..69f2d15 100644 --- a/debian/control +++ b/debian/control @@ -91,7 +91,7 @@ Depends: ${misc:Depends}, adduser, psmisc, - x2goclient (>= 3.99.3.0-0~), + x2goclient (>= 4.0.1.2-0~), xauth, xinit, locales, diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_start b/x2gothinclientmanagement/share/etc/x2gothinclient_start index 3ff2b4d..8a8ab74 100755 --- a/x2gothinclientmanagement/share/etc/x2gothinclient_start +++ b/x2gothinclientmanagement/share/etc/x2gothinclient_start @@ -28,7 +28,7 @@ --geometry=fullscreen \ --thinclient \ --haltbt \ - --read-exports-from=~x2gothinclient/export \ + --read-exports-from=~/export \ --background=/etc/x2go/x2goclient-background.svg \ --no-session-edit \ --session=X2Go.Example \ @@ -42,9 +42,8 @@ # --geometry=fullscreen \ # --thinclient \ # --haltbt \ -# --read-exports-from=~x2gothinclient/export \ +# --read-exports-from=~/export \ # --background=/etc/x2go/x2goclient-background.svg \ # --broker-url=https://x2gobroker.intern:8080/plain/zeroconf \ # --broker-autologoff # --add-to-known-hosts & - 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). [View Less]

1 0

x2gothinclient.git - build-main (branch) updated: 1.1.0.0-26-ge8db747
by git-admin＠x2go.org 22 Nov '13

22 Nov '13

The branch, build-main has been updated via e8db74714aef8044b9f6830b9f7c423756398f30 (commit) from 37e9a55ba62ca1078ed00aa4aa2847edc77e9cc6 (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: .../etc/… [View More]

1 0

x2gothinclient.git - build-main (branch) updated: 1.1.0.0-31-g808b5e7
by git-admin＠x2go.org 22 Nov '13

22 Nov '13

The branch, build-main has been updated via 808b5e7ea4e36b0574344e6c98895204a69725a8 (commit) from 937fd25f831c5a0e1a617eab132d8f416d5b36ee (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/… [View More]changelog | 2 ++ .../share/etc/x2gothinclient_init | 1 + x2gousbmount/x2gousbmount | 24 ++++++++++++++------ 3 files changed, 20 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5498d6c..6265232 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low - Update initramfs at the very end of the TCE creation. - Do not over-mount /run as tmpfs. This is already done by the Debian boot process. + - Monitor mounted USB devices via ~x2gothinclient/mounts (and not via + deprecated location /var/run). * debian/control: + New bin:package x2gothinclient-chroot. + Make sure x2gothinclient-chroot pulls in editing tools like diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_init b/x2gothinclientmanagement/share/etc/x2gothinclient_init index e70cf9e..2aae04d 100755 --- a/x2gothinclientmanagement/share/etc/x2gothinclient_init +++ b/x2gothinclientmanagement/share/etc/x2gothinclient_init @@ -26,6 +26,7 @@ test -e /etc/x2go/x2gothinclient_sessions && cp /etc/x2go/x2gothinclient_session test -e /etc/x2go/freerdp/known_hosts && mkdir -p ~x2gothinclient/.freerdp && cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts mkdir -p ~x2gothinclient/.kde mkdir -p ~x2gothinclient/.kde/socket-`hostname` +mkdir -p ~x2gothinclient/mounts mkdir -p ~x2gothinclient/export mkdir -p ~x2gothinclient/logins mkdir -p ~x2gothinclient/.ssh diff --git a/x2gousbmount/x2gousbmount b/x2gousbmount/x2gousbmount index 7bf7b5a..28985ca 100755 --- a/x2gousbmount/x2gousbmount +++ b/x2gousbmount/x2gousbmount @@ -41,6 +41,16 @@ if ( check_x2gothinclientd() ) my $action=$ENV{'ACTION'}; my @ldev=split("/","$dev"); my $ldev=@ldev[@ldev-1]; + my $mntdir; + if ( -d expand_user("~/mounts")) { + $mntdir=expand_user("~/run"); + } elsif ( -d "/var/run" ) { + $mntdir="/var/run"; + } elsif ( -d "/run" ) { + $mntdir="/run"; + } else { + die "No directory found that we could use as \$mntdir..." + } my $name="${vendor}_${model}"; $name=~s/ //g; @@ -67,7 +77,7 @@ if ( check_x2gothinclientd() ) if(system("mount $dev /media/$name/$ldev -o uid=x2gothinclient,sync,uni_xlate")==0) { # if mounted, inform x2goclient about it... - system("touch /var/run/$ldev.mounted"); + system("touch $mntdir/$ldev.mounted"); open (D,">",expand_filename("~x2gothinclient/export/$name.$ldev")); print D "export=/media/$name/$ldev\n"; close (D); @@ -75,7 +85,7 @@ if ( check_x2gothinclientd() ) else { # the mount failed, let's assume that the device is encrypted... - my $enc=`ls -1 /var/run | grep .encrypted`; + my $enc=`ls -1 $mntdir | grep .encrypted`; if( $enc eq "" ) { # use cryptsetup to decrypt the device... @@ -85,7 +95,7 @@ if ( check_x2gothinclientd() ) if(system("mount /dev/mapper/keystick /media/$name/$ldev ")==0) { # inform x2goclient about this... - system("touch /var/run/$ldev.encrypted"); + system("touch $mntdir/$ldev.encrypted"); system("chown -R x2gothinclient /media/$name/$ldev/dsa.key"); open (D,">",expand_filename("~/x2gothinclient/logins/$name.$ldev")); print D "login=/media/$name/$ldev\n"; @@ -111,20 +121,20 @@ if ( check_x2gothinclientd() ) ### # we rely on our own mount logistics here... - if ( -e "/var/run/$ldev.mounted" ) + if ( -e "$mntdir/$ldev.mounted" ) { # inform x2goclient that the device has been removed system ("umount -ff /media/$name/$ldev"); - unlink ("/var/run/$ldev.mounted"); + unlink ("$mntdir/$ldev.mounted"); open ( D,">",expand_filename("~x2gothinclient/export/$name.$ldev.unexport")); print D "unexport=/media/$name/$ldev\n"; close (D); } - elsif ( -e "/var/run/$ldev.encrypted" ) + elsif ( -e "$mntdir/$ldev.encrypted" ) { # inform x2goclient that the device has been removed # release the encrypted device mapping - unlink ("/var/run/$ldev.encrypted"); + unlink ("$mntdir/$ldev.encrypted"); open ( D,">",expand_filename("~/x2gothinclient/logins/$name.$ldev.unexport")); print D "logout=/media/$name/$ldev\n"; system("umount /media/$name/$ldev"); 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). [View Less]

1 0

x2gothinclient.git - build-main (branch) updated: 1.1.0.0-29-g7399e80
by git-admin＠x2go.org 22 Nov '13

22 Nov '13

The branch, build-main has been updated via 7399e80bd8181c79b16d80a6c2213619dfe2ff87 (commit) from e8ee22f9cf5b2762a9bcc0df462db979f9bd9fe3 (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/… [View More]

1 0

x2gothinclient.git - build-main (branch) updated: 1.1.0.0-13-g47304ba
by git-admin＠x2go.org 22 Nov '13

22 Nov '13

The branch, build-main has been updated via 47304ba48c9bad3c83fb103d9cb83b28d5e4ddba (commit) from 333ea451e7ef5da3d610431cb0880604b6dac582 (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/… [View More]changelog | 3 + debian/control | 78 +++++++++++++------- .../sbin/x2gothinclient_create | 11 +-- 3 files changed, 58 insertions(+), 34 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e4b367d..4120407 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low - Remove chroot bootstrap cruft when finished with creating the TCE chroot. - Deactivate serial line terminals on X2Go thinclients. + - Install TCE dependencies via meta-package x2gothinclient-chroot. + * debian/control: + + New bin:package x2gothinclient-chroot. [ Arnold Krille ] * New upstream version (1.1.0.1): diff --git a/debian/control b/debian/control index 968d59b..277c0b3 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Recommends: nfs-kernel-server Suggests: dhcp3-server | dnsmasq | isc-dhcp-server -Description: Management tools for X2Go thin client chroot server +Description: Management tools for X2Go Thin Client chroot server X2Go is a server based computing environment with - session resuming - low bandwidth support @@ -40,11 +40,48 @@ Description: Management tools for X2Go thin client chroot server x2gothinclientmanagement: ------------------------- IMPORTANT: Install this package on the chroot server that - provides X2Go thin client images over PXE/Etherboot. + provides X2Go Thin Client images over PXE/Etherboot. . For chroot servers we recommend a very separate machine (not your main server on your network) that only serves this purpose. +Package: x2gothinclient-chroot +Architecture: all +Depends: + ${misc:Depends}, + alsa-base, + nfs-common, + patch, + plymouth, + plymouth-themes-all, + pulseaudio-x11 | pulseaudio, + syslinux, + x2gothinclient, +Recommends: + acpid, + gnupg-agent, + pinentry-x2go, + gpgsm, + memtest86+, + x11-xserver-utils, + x2gocdmanager, + x2gousbmount, + x2gosmartcardrules, +Description: Install X2Go Thin Client chroot (meta-package) + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session broker support + - client-side mass storage mounting support + - client-side printing support + - audio support + - authentication by smartcard and USB stick + . + x2gothinclient-chroot: + ---------------------- + This meta-package installs all X2Go TCE dependencies. This + package is used in the X2Go Thin Client's chroot. + Package: x2gothinclient Architecture: all Depends: @@ -55,20 +92,9 @@ Depends: xauth, xinit, locales, - pulseaudio-x11 | pulseaudio, dbus-x11, policykit-1, -Recommends: - x2gocdmanager, - x2gousbmount, - x2gosmartcardrules, - gnupg-agent, - pinentry-x2go, - gpgsm, - x11-xserver-utils, Suggests: - plymouth, - plymouth-themes-all Breaks: x2gothinshutdown Replaces: @@ -85,15 +111,17 @@ Description: login daemon starting x2goclient in displaymanager mode . x2gothinclient: --------------- - IMPORTANT: Use this Package only for the X2Go THIN CLIENT ENVIRONMENT + IMPORTANT: Use this Package only for the X2Go Thin Client Environment (This package is meant to be installed in a CHROOT environment!!!) . - This package starts x2goclient in fullscreen mode---without window decorations, - without menu and toolbar and optionally with enabled LDAP support. The - package ships the core X2Go thin client daemon that guards over - x2goclient functionality. + This package starts X2Go Client in fullscreen mode---without window + decorations, without menu and toolbar and optionally with enabled + session broker support. + . + This package ships the core X2Go Thin Client daemon that guards over + X2Go Client functionality. . - x2goclient will behave like xdm, kdm or gdm on X2Go thin clients. + X2Go Client in thin-client-mode will behave like xdm, kdm or gdm. Package: x2gousbmount Architecture: all @@ -114,11 +142,11 @@ Description: clientside usb mass-storage device mounting . x2gousbmount: ------------- - IMPORTANT: Use this Package only for the x2go THIN CLIENT ENVIRONMENT + IMPORTANT: Use this Package only for the x2go Thin Client Environment (This package is meant to be installed in a CHROOT environment!!!) . This package adds client-side USB mass storage device mounting using - UDEV rules to your X2Go thin client. + UDEV rules to your X2Go Thin Client. Package: x2gocdmanager Architecture: any @@ -141,11 +169,11 @@ Description: clientside daemon enabling automatic CD-Rom mounting . x2gocdmanager: -------------- - IMPORTANT: Use this Package only for the x2go THIN CLIENT ENVIRONMENT + IMPORTANT: Use this Package only for the x2go Thin Client Environment (This package is meant to be installed in a CHROOT environment!!!) . - This package adds a client-side daemon to your X2Go thin client that enables - automatic CD-ROM mounting within thin client X2Go sessions. + This package adds a client-side daemon to your X2Go Thin Client that enables + automatic CD-ROM mounting within Thin Client X2Go sessions. Package: x2gosmartcardrules Architecture: all @@ -164,7 +192,7 @@ Description: UDEV rules for smartcard readers . x2gosmartcardrules: ------------------- - IMPORTANT: Use this Package only for the x2go THIN CLIENT ENVIRONMENT + IMPORTANT: Use this Package only for the x2go Thin Client Environment (This package is meant to be installed in a CHROOT environment!!!) . This package provides UDEV rules for smartcard readers (devices that diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 3fb8eff..61854e7 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -170,7 +170,7 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get update [ \$? -eq 0 ] && apt-get install $TC_SHELL -y -[ \$? -eq 0 ] && apt-get install syslinux locales -y +[ \$? -eq 0 ] && apt-get install locales -y if [ \$? -eq 0 -a "x${TC_NONINTERACTIVE}" != "x" ]; then dpkg-reconfigure locales fi @@ -180,13 +180,7 @@ fi [ \$? -eq 0 ] && test -h /initrd.img && mv /initrd.img /initrd.img.486.tmp || true [ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.486.tmp | sed 's@/boot@boot@') && ln -sf \$LINK_TARGET /initrd.img.486 && rm -f /initrd.img.486.tmp -[ \$? -eq 0 ] && apt-get install alsa-base pulseaudio -y -[ \$? -eq 0 ] && apt-get install patch -y - -[ \$? -eq 0 ] && apt-get install x2gothinclient x2gocdmanager x2gosmartcardrules x2gousbmount -y - -# some extra tools that are useful on the TCE -[ \$? -eq 0 ] && apt-get install vim mc acpid memtest86+ -y +[ \$? -eq 0 ] && apt-get install x2gothinclient-chroot -y # blacklist kernel modules [ \$? -eq 0 ] && echo && echo "# modules blacklisted on X2Go Thin Clients..." >> /etc/modprobe.d/blacklist.conf @@ -210,7 +204,6 @@ fi [ \$? -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 || true [ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf || true 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). [View Less]

1 0

x2gothinclient.git - build-main (branch) updated: 1.1.0.0-17-g68c1d06
by git-admin＠x2go.org 22 Nov '13

22 Nov '13

The branch, build-main has been updated via 68c1d061bce8f65005285d263c1cb53dfafe6943 (commit) from 2043c0d385e7592cfbac2eec6283e0356fdf7c01 (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: .../sbin/… [View More]

1 0

x2gothinclient.git - build-main (branch) updated: 1.1.0.0-16-g2043c0d
by git-admin＠x2go.org 22 Nov '13

22 Nov '13

The branch, build-main has been updated via 2043c0d385e7592cfbac2eec6283e0356fdf7c01 (commit) from c36057b91449a2d743b7dd1730eb145cae3a8aec (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/… [View More]changelog | 2 ++ debian/x2gothinclient-chroot.init | 1 + .../init/x2gothinclient-chroot.init | 31 ++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 120000 debian/x2gothinclient-chroot.init create mode 100644 x2gothinclient-chroot/init/x2gothinclient-chroot.init The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 25a8595..360370a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low - Deactivate serial line terminals on X2Go thinclients. - Install TCE dependencies via meta-package x2gothinclient-chroot. - Move init scripts from debian/ folder into upstream folders. + - Provide x2gothinclient-chroot.init script that tweaks the chroot + during thin client startup. * debian/control: + New bin:package x2gothinclient-chroot. diff --git a/debian/x2gothinclient-chroot.init b/debian/x2gothinclient-chroot.init new file mode 120000 index 0000000..79cca51 --- /dev/null +++ b/debian/x2gothinclient-chroot.init @@ -0,0 +1 @@ +../x2gothinclient-chroot/init/x2gothinclient-chroot.init \ No newline at end of file diff --git a/x2gothinclient-chroot/init/x2gothinclient-chroot.init b/x2gothinclient-chroot/init/x2gothinclient-chroot.init new file mode 100644 index 0000000..c9e2e7c --- /dev/null +++ b/x2gothinclient-chroot/init/x2gothinclient-chroot.init @@ -0,0 +1,31 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: x2gothinclient-chroot +# Required-Start: $local_fs +# Required-Stop: +# Default-Start: S +# Default-Stop: +# X-Start-Before: nfs-common alsa-utils +# Short-Description: +# Description: Prepare X2Go TCE tmpfs directories for usage +### END INIT INFO + +case "$1" in + start|"") + # prep tmpfs subfolders for nfs-common + mkdir -p /var/lib/nfs/{rpc_pipefs,sm,sm.bak} + chown statd:nogroup /var/lib/nfs/{rpc_pipefs,sm,sm.bak} + exit 0 + ;; + restart|reload|force-reload) + echo "Error: argument '$1' not supported" >&2 + exit 3 + ;; + stop) + # No-op + ;; + *) + echo "Usage: x2gothinclient-chroot start" >&2 + exit 3 + ;; +esac 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). [View Less]

1 0

x2gothinclient.git - build-main (branch) updated: 1.1.0.0-15-gc36057b
by git-admin＠x2go.org 22 Nov '13

22 Nov '13

The branch, build-main has been updated via c36057b91449a2d743b7dd1730eb145cae3a8aec (commit) from a3a5076d545cd7144af4417accc1fa2f4b97d849 (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/… [View More]changelog | 1 + debian/x2gocdmanager.init | 82 +--------------- debian/x2gothinclient.init | 102 +------------------- {debian => x2gocdmanager/init}/x2gocdmanager.init | 0 .../init}/x2gothinclient.init | 0 5 files changed, 3 insertions(+), 182 deletions(-) mode change 100644 => 120000 debian/x2gocdmanager.init mode change 100644 => 120000 debian/x2gothinclient.init copy {debian => x2gocdmanager/init}/x2gocdmanager.init (100%) copy {debian => x2gothinclient/init}/x2gothinclient.init (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4120407..25a8595 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low TCE chroot. - Deactivate serial line terminals on X2Go thinclients. - Install TCE dependencies via meta-package x2gothinclient-chroot. + - Move init scripts from debian/ folder into upstream folders. * debian/control: + New bin:package x2gothinclient-chroot. diff --git a/debian/x2gocdmanager.init b/debian/x2gocdmanager.init deleted file mode 100644 index 57bcce2..0000000 --- a/debian/x2gocdmanager.init +++ /dev/null @@ -1,81 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org -# Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> -# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> - -# X2Go 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. -# -# X2Go 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. - -### BEGIN INIT INFO -# Provides: x2gocdmanager -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# 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 -NAME=x2gocdmanager -DESC=x2gocdmanager - -test -x $DAEMON || exit 0 - -case "$1" in - start) - # only start the X2Go CD Manager if x2gothinclientd is configured as the default display manager - if [ -e /etc/X11/default-display-manager ] && [ "$(cat /etc/X11/default-display-manager)" = "/usr/sbin/x2gothinclientd" ]; then - log_daemon_msg "Starting $DESC" "x2gocdmanager" - start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS - log_end_msg $? - fi - ;; - stop) - log_daemon_msg "Stopping $DESC" "x2gocdmanager" - start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid || true - log_end_msg $? - ;; - force-reload) - start-stop-daemon --stop --test --quiet --pidfile /var/run/$NAME.pid && $0 restart || exit 0 - ;; - restart) - log_daemon_msg "Restarting $DESC" "x2gocdmanager" - $0 stop - sleep 1 - $0 start - log_end_msg $? - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/x2gocdmanager.init b/debian/x2gocdmanager.init new file mode 120000 index 0000000..2728572 --- /dev/null +++ b/debian/x2gocdmanager.init @@ -0,0 +1 @@ +../x2gocdmanager/init/x2gocdmanager.init \ No newline at end of file diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init deleted file mode 100644 index 7c2b2e9..0000000 --- a/debian/x2gothinclient.init +++ /dev/null @@ -1,101 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org -# Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> -# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> - -# X2Go 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. -# -# X2Go 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. - -### BEGIN INIT INFO -# Provides: x2gothinclient -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start and stop the x2go thinclient 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/x2gothinclientd -NAME=x2gothinclient -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:advanced:tce:install" - exit 0 -fi - -# pre-init X2Go Thin Client through init script... -test -x /etc/x2go/x2gothinclient_init && . /etc/x2go/x2gothinclient_init - -# To start x2gothinclient even if it is not the default display manager, change -# HEED_DEFAULT_DISPLAY_MANAGER to "false." -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 - ;; - stop) - if [ -e /var/run/$NAME.pid ]; then - log_daemon_msg "Stopping $DESC" "x2gothinclientd" - start-stop-daemon --oknodo --stop --quiet --retry 10 --pidfile /var/run/$NAME.pid - 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 - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init new file mode 120000 index 0000000..0161066 --- /dev/null +++ b/debian/x2gothinclient.init @@ -0,0 +1 @@ +../x2gothinclient/init/x2gothinclient.init \ No newline at end of file diff --git a/debian/x2gocdmanager.init b/x2gocdmanager/init/x2gocdmanager.init similarity index 100% copy from debian/x2gocdmanager.init copy to x2gocdmanager/init/x2gocdmanager.init diff --git a/debian/x2gothinclient.init b/x2gothinclient/init/x2gothinclient.init similarity index 100% copy from debian/x2gothinclient.init copy to x2gothinclient/init/x2gothinclient.init 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). [View Less]

1 0

x2gothinclient.git - build-main (branch) updated: 1.1.0.0-14-ga3a5076
by git-admin＠x2go.org 22 Nov '13

22 Nov '13

The branch, build-main has been updated via a3a5076d545cd7144af4417accc1fa2f4b97d849 (commit) from 47304ba48c9bad3c83fb103d9cb83b28d5e4ddba (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: .../sbin/… [View More]

1 0

x2gothinclient.git - build-main (branch) updated: 1.1.0.0-18-g32682bd
by git-admin＠x2go.org 22 Nov '13

22 Nov '13

The branch, build-main has been updated via 32682bd12325193da964f4cf0a34824daf95a438 (commit) from 68c1d061bce8f65005285d263c1cb53dfafe6943 (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/… [View More]

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2013