[X2Go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.8-96-g0723724

[X2Go dev team]

The branch, master 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 -----------------------------------------------------------------
commit 07237248eb43f48b171b4b6471ca42457ca42af6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Apr 2 02:39:02 2013 +0200

    install pulseaudio first, then x2gothinclient

-----------------------------------------------------------------------

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 at 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).