x2go-commits

x2go-commits@lists.x2go.org

1 participants
37914 discussions

x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-99-ga78fd57
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via a78fd5741d1be4b2f2b77ee6eb9387dc3ee80e98 (commit) from 4b5d38bb785cba6733e0913ea375f5e47078e586 (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/x2gothinclient_preptftpboot | 3 --- 1 file changed, 3 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot index 1dd9101..767a4d4 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot +++ b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot @@ -68,9 +68,6 @@ cd "$TC_TFTP_BOOT" # 486 kernel image ln -sfv "$TC_CHROOT/vmlinuz.486" "$TC_TFTP_BOOT/vmlinuz.486" ln -sfv "$TC_CHROOT/initrd.img.486" "$TC_TFTP_BOOT/initrd.img.486" -# 686 kernel image -ln -sfv "$TC_CHROOT/vmlinuz.686" "$TC_TFTP_BOOT/vmlinuz.686" -ln -sfv "$TC_CHROOT/initrd.img.686" "$TC_TFTP_BOOT/initrd.img.686" # memtest86+ ln -sfv "$TC_CHROOT/boot/memtest86+.bin" "$TC_TFTP_BOOT/memtest86+.bin" # syslinux components 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).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-105-g8a0e3cb
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 8a0e3cb4c2138430ab420e6e1e18b4f4d2e18209 (commit) from b5d162e7e16051e56c1e7e5d5f000fac655ef0e8 (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/x2gothinclient_create | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 42847b2..fdaa1fd 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -176,7 +176,7 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && sed -e 's/BOOT=local/BOOT=nfs/' -i /etc/initramfs-tools/initramfs.conf [ \$? -eq 0 ] && rm -f /etc/udev/rules.d/*-persistent-*.rules -[ \$? -eq 0 ] && if getent passwd x2gothinclient 1>/dev/null; then adduser --system --disabled-password --disabled-login --shell /bin/bash --group --home /var/lib/x2gothinclient x2gothinclient; fi +[ \$? -eq 0 ] && if ! getent passwd x2gothinclient 1>/dev/null; then adduser --system --disabled-password --disabled-login --shell /bin/bash --group --home /var/lib/x2gothinclient x2gothinclient; fi [ \$? -eq 0 ] && adduser x2gothinclient audio [ \$? -eq 0 ] && adduser x2gothinclient pulse [ \$? -eq 0 ] && adduser pulse audio 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).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-94-ga00b75f
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via a00b75fa5f65f69481301287885b26029763d7ee (commit) from f839a5abf03b892d08f5d0a84dbc49330b26e700 (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 | 1 + x2gothinclient/sbin/x2gothinclientd | 2 ++ 2 files changed, 3 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3714b90..fcbc4d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,6 +59,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low x2gothinclientd is running. - When finishing x2gothinclientd, wait when killing processes till all processes have vanished. Only kill processes owned by user x2gothinclient. + - When finishing x2gothinclientd, make sure no dbus-* processes remain. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Priority: optional. diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 08ec9e2..d084166 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -28,6 +28,8 @@ sub catch_term system ("killall --user x2gothinclient --wait x2goclient"); system ("killall --user x2gothinclient --wait Xorg"); system ("killall --user x2gothinclient --wait pulseaudio"); + system ("killall --user x2gothinclient --wait dbus-daemon"); + system ("killall --user x2gothinclient --wait dbus-launch"); unlink("/var/run/x2gothinclient.pid"); exit; } 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).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-89-gfbca950
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via fbca95097bd7536470365bd550932ed3af385517 (commit) from e88a8aa696de249c9767fbb8eab254642d0eb715 (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/x2gothinclient.postrm | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/debian/x2gothinclient.postrm b/debian/x2gothinclient.postrm index 1619fd8..70a170d 100755 --- a/debian/x2gothinclient.postrm +++ b/debian/x2gothinclient.postrm @@ -24,6 +24,7 @@ case "$1" in if [ $timer -gt 20 ]; then # FIXME: kill x2gothinclientd and x2goclient here break + fi done getent passwd x2gothinclient >/dev/null && deluser x2gothinclient getent group x2gothinclient >/dev/null && delgroup x2gothinclient 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).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-92-g96176a4
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 96176a41fb69a32aebc04e75e42699ad7bd5b24c (commit) from cd7b3e1d876a16aa36afda64f07f281a553a6bd1 (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/x2gothinclient.init | 2 +- debian/x2gothinclient.postrm | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) The diff of changes is: diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init index 15c0028..f1f6271 100644 --- a/debian/x2gothinclient.init +++ b/debian/x2gothinclient.init @@ -78,7 +78,7 @@ case "$1" in stop) if [ -e /var/run/$NAME.pid ]; then log_daemon_msg "Stopping $DESC" "x2gothinclientd" - start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid + start-stop-daemon --stop --quiet --retry 10 --pidfile /var/run/$NAME.pid log_end_msg $? fi ;; diff --git a/debian/x2gothinclient.postrm b/debian/x2gothinclient.postrm index 4f1e365..ac60f17 100755 --- a/debian/x2gothinclient.postrm +++ b/debian/x2gothinclient.postrm @@ -17,15 +17,6 @@ set -e case "$1" in purge) - timer=0 - while ps ax | grep x2gothinclient | grep thinclientd 1>/dev/null; do - sleep 1 - timer=$(($timer+1)) - if [ $timer -gt 20 ]; then - # FIXME: kill x2gothinclientd and x2goclient here - break - fi - done getent passwd x2gothinclient >/dev/null && deluser x2gothinclient getent group x2gothinclient >/dev/null && delgroup x2gothinclient 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).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-91-gcd7b3e1
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via cd7b3e1d876a16aa36afda64f07f281a553a6bd1 (commit) from dc9aebf35fc177a18cb80d526872217f8c35b2f2 (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/x2gothinclient.postrm | 2 +- x2gosmartcardrules/x2gognupgccid | 2 +- x2gousbmount/x2gousbmount | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/x2gothinclient.postrm b/debian/x2gothinclient.postrm index 4a8284a..4f1e365 100755 --- a/debian/x2gothinclient.postrm +++ b/debian/x2gothinclient.postrm @@ -18,7 +18,7 @@ set -e case "$1" in purge) timer=0 - while ps ax | grep x2gothinclient | grep x2gothinclientd 1>/dev/null; do + while ps ax | grep x2gothinclient | grep thinclientd 1>/dev/null; do sleep 1 timer=$(($timer+1)) if [ $timer -gt 20 ]; then diff --git a/x2gosmartcardrules/x2gognupgccid b/x2gosmartcardrules/x2gognupgccid index 9632baa..b7715fd 100755 --- a/x2gosmartcardrules/x2gognupgccid +++ b/x2gosmartcardrules/x2gognupgccid @@ -23,7 +23,7 @@ GROUP=scard set -e # only do this if x2gothinclientd is default display manager, otherwise this makes no sense -if ps ax | grep x2gothinclient | grep x2gothinclientd 1>/dev/null; then +if ps ax | grep x2gothinclient | grep thinclientd 1>/dev/null; then DEV=`echo ${DEVICE} | sed 's/proc/dev/'` diff --git a/x2gousbmount/x2gousbmount b/x2gousbmount/x2gousbmount index ca2efa9..0a5123b 100755 --- a/x2gousbmount/x2gousbmount +++ b/x2gousbmount/x2gousbmount @@ -23,7 +23,7 @@ use File::Path::Expand; check_x2gothinclientd() { my $x=`ps ax | grep x2gothinclient`; - if ( $x=~m/x2gothinclientd/ ) + if ( $x=~m/thinclientd/ ) { return 1; } 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).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-96-g0723724
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 07237248eb43f48b171b4b6471ca42457ca42af6 (commit) from 61e4def335dd071c716253938552f523d5cef450 (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/x2gothinclient.postinst | 2 +- .../sbin/x2gothinclient_create | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/x2gothinclient.postinst b/debian/x2gothinclient.postinst index 4b8aa0d..2c78125 100755 --- a/debian/x2gothinclient.postinst +++ b/debian/x2gothinclient.postinst @@ -72,7 +72,7 @@ case "$1" in # make sure the x2gothinclient user is in its appropriate groups if getent group audio 1>/dev/null; then adduser x2gothinclient audio; fi - if getent group audio 1>/dev/null; then getent passwd pulse 1>/dev/null; adduser pulse audio; fi + if getent group audio 1>/dev/null; then if getent passwd pulse 1>/dev/null; then adduser pulse audio; fi; fi if getent group pulse 1>/dev/null; then adduser x2gothinclient pulse; fi if getent group cdrom 1>/dev/null; then adduser x2gothinclient cdrom; fi if getent group plugdev 1>/dev/null; then adduser x2gothinclient plugdev; fi diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 72de25e..3d160d5 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -163,15 +163,16 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && mv /initrd.img /initrd.img.486.tmp [ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.486.tmp | sed 's@/boot@boot@') && ln -s \$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 # blacklist kernel modules [ \$? -eq 0 ] && echo && echo "# modules blacklisted on X2Go Thin Clients..." >> /etc/modprobe.d/blacklist.conf [ \$? -eq 0 ] && for mod in $TC_MODULE_BLACKLIST; do echo "blacklist \$mod" >> /etc/modprobe.d/blacklist.conf; done -# Pulsaudio must come afterwards until the thinclient-package is fixed -[ \$? -eq 0 ] && apt-get install alsa-base pulseaudio -y -[ \$? -eq 0 ] && apt-get install patch -y +# boot from NFS (only relevant for Debian squeeze) [ \$? -eq 0 ] && sed -e 's/BOOT=local/BOOT=nfs/' -i /etc/initramfs-tools/initramfs.conf [ \$? -eq 0 ] && rm -f /etc/udev/rules.d/*-persistent-*.rules 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).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-97-gfc475f8
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via fc475f84bcca986b08680175b7a546c9b9e6ded9 (commit) from 07237248eb43f48b171b4b6471ca42457ca42af6 (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: x2gothinclient/sbin/x2gothinclientd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index d084166..ff3e5b5 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -26,7 +26,7 @@ use IPC::Open3; sub catch_term { system ("killall --user x2gothinclient --wait x2goclient"); - system ("killall --user x2gothinclient --wait Xorg"); + system ("killall --wait Xorg"); system ("killall --user x2gothinclient --wait pulseaudio"); system ("killall --user x2gothinclient --wait dbus-daemon"); system ("killall --user x2gothinclient --wait dbus-launch"); 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).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-95-g61e4def
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 61e4def335dd071c716253938552f523d5cef450 (commit) from a00b75fa5f65f69481301287885b26029763d7ee (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/x2gocdmanager.init | 2 +- debian/x2gothinclient.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/x2gocdmanager.init b/debian/x2gocdmanager.init index 26e4dfa..57bcce2 100644 --- a/debian/x2gocdmanager.init +++ b/debian/x2gocdmanager.init @@ -58,7 +58,7 @@ case "$1" in ;; stop) log_daemon_msg "Stopping $DESC" "x2gocdmanager" - start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid || true + start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid || true log_end_msg $? ;; force-reload) diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init index f1f6271..7c2b2e9 100644 --- a/debian/x2gothinclient.init +++ b/debian/x2gothinclient.init @@ -78,7 +78,7 @@ case "$1" in stop) if [ -e /var/run/$NAME.pid ]; then log_daemon_msg "Stopping $DESC" "x2gothinclientd" - start-stop-daemon --stop --quiet --retry 10 --pidfile /var/run/$NAME.pid + start-stop-daemon --oknodo --stop --quiet --retry 10 --pidfile /var/run/$NAME.pid log_end_msg $? fi ;; 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).

1 0

x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-90-gdc9aebf
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via dc9aebf35fc177a18cb80d526872217f8c35b2f2 (commit) from fbca95097bd7536470365bd550932ed3af385517 (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/x2gothinclient.postrm | 2 +- x2gosmartcardrules/x2gognupgccid | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/x2gothinclient.postrm b/debian/x2gothinclient.postrm index 70a170d..4a8284a 100755 --- a/debian/x2gothinclient.postrm +++ b/debian/x2gothinclient.postrm @@ -18,7 +18,7 @@ set -e case "$1" in purge) timer=0 - while ps ax | grep x2gothinclient | x2gothinclientd 1>/dev/null; do + while ps ax | grep x2gothinclient | grep x2gothinclientd 1>/dev/null; do sleep 1 timer=$(($timer+1)) if [ $timer -gt 20 ]; then diff --git a/x2gosmartcardrules/x2gognupgccid b/x2gosmartcardrules/x2gognupgccid index df3b229..9632baa 100755 --- a/x2gosmartcardrules/x2gognupgccid +++ b/x2gosmartcardrules/x2gognupgccid @@ -23,7 +23,7 @@ GROUP=scard set -e # only do this if x2gothinclientd is default display manager, otherwise this makes no sense -if ps ax | grep x2gothinclient | x2gothinclientd 1>/dev/null; then +if ps ax | grep x2gothinclient | grep x2gothinclientd 1>/dev/null; then DEV=`echo ${DEVICE} | sed 's/proc/dev/'` 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).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits