x2gothinclient.git - tmpfs (branch) updated: d0029dc08e1bf5f21236a2e5334e19714e9f5fbd - x2go-commits

16 Jun 2011

The branch, tmpfs has been updated
       via  d0029dc08e1bf5f21236a2e5334e19714e9f5fbd (commit)
      from  198db707b6cbc8186927b1271c4874736ec0c1ad (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 d0029dc08e1bf5f21236a2e5334e19714e9f5fbd
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Thu Jun 16 16:02:14 2011 +0200

    Fix $? statements, test-fix for mtab diversion

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

Summary of changes:
 .../sbin/x2gothinclient_create                     |   67 ++++++++++----------
 1 files changed, 33 insertions(+), 34 deletions(-)

The diff of changes is:

diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index af8d901..b57bb0c 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -106,51 +106,50 @@ mkdir -p /tmp/user/0
 mkdir -p /var/lib/xkb
 mkdir -p /var/lib/nfs
 ### A Quick workaround for squeeze until the thinclient-package is fixed
-[ $? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && echo "$TC_X2GO_DEBURL" > /etc/apt/sources.list.d/x2go.list
-[ $? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && apt-get update
-[ $? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && apt-get install x2go-keyring -y --force-yes
-[ $? -eq 0 ] && apt-get update
-[ $? -eq 0 ] && apt-get install $TC_SHELL
-[ $? -eq 0 ] && apt-get install syslinux locales -y
-[ $? -eq 0 ] && apt-get install linux-image-486 -y
-[ $? -eq 0 ] && cp /vmlinuz /vmlinuz.486
-[ $? -eq 0 ] && cp /initrd.img /initrd.img.486
-[ $? -eq 0 ] && apt-get install linux-image-686 -y
-[ $? -eq 0 ] && cp /vmlinuz /vmlinuz.686
-[ $? -eq 0 ] && cp /initrd.img /initrd.img.686
-[ $? -eq 0 ] && apt-get install x2gothinclient x2gocdmanager x2gosmartcardrules x2gousbmount -y
+[ \$? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && echo "$TC_X2GO_DEBURL" > /etc/apt/sources.list.d/x2go.list
+[ \$? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && apt-get update
+[ \$? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && apt-get install x2go-keyring -y --force-yes
+[ \$? -eq 0 ] && apt-get update
+[ \$? -eq 0 ] && apt-get install $TC_SHELL
+[ \$? -eq 0 ] && apt-get install syslinux locales -y
+[ \$? -eq 0 ] && apt-get install linux-image-486 -y
+[ \$? -eq 0 ] && cp /vmlinuz /vmlinuz.486
+[ \$? -eq 0 ] && cp /initrd.img /initrd.img.486
+[ \$? -eq 0 ] && apt-get install linux-image-686 -y
+[ \$? -eq 0 ] && cp /vmlinuz /vmlinuz.686
+[ \$? -eq 0 ] && cp /initrd.img /initrd.img.686
+[ \$? -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
+[ \$? -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
 
 # Pulsaudio must come afterwards until the thinclient-package is fixed
-[ $? -eq 0 ] && apt-get install pulseaudio -y
-[ $? -eq 0 ] && dpkg-reconfigure locales
-[ $? -eq 0 ] && apt-get install patch -y
-[ $? -eq 0 ] && patch /etc/initramfs-tools/initramfs.conf <<PATCH
+[ \$? -eq 0 ] && apt-get install pulseaudio -y
+[ \$? -eq 0 ] && dpkg-reconfigure locales
+[ \$? -eq 0 ] && apt-get install patch -y
+[ \$? -eq 0 ] && patch /etc/initramfs-tools/initramfs.conf <<PATCH
 39c39
 < BOOT=local
 ---
...
BOOT=nfs
 PATCH
-[ $? -eq 0 ] && rm -f /etc/mtab
-[ $? -eq 0 ] && ln -s /tmp/mtab /etc/mtab
-[ $? -eq 0 ] && rm -f /etc/udev/rules.d/*-persistent-*.rules
-[ $? -eq 0 ] && useradd x2goclient
-[ $? -eq 0 ] && adduser x2goclient audio
-[ $? -eq 0 ] && adduser x2goclient pulse
-[ $? -eq 0 ] && adduser pulse audio
-[ $? -eq 0 ] && adduser x2goclient cdrom
-[ $? -eq 0 ] && adduser x2goclient plugdev
-[ $? -eq 0 ] && groupadd scard
-[ $? -eq 0 ] && adduser x2goclient scard
-[ $? -eq 0 ] && update-initramfs -u -v
-[ $? -eq 0 ] && passwd -l root
+[ \$? -eq 0 ] && rm -f /etc/udev/rules.d/*-persistent-*.rules
+[ \$? -eq 0 ] && useradd x2goclient
+[ \$? -eq 0 ] && adduser x2goclient audio
+[ \$? -eq 0 ] && adduser x2goclient pulse
+[ \$? -eq 0 ] && adduser pulse audio
+[ \$? -eq 0 ] && adduser x2goclient cdrom
+[ \$? -eq 0 ] && adduser x2goclient plugdev
+[ \$? -eq 0 ] && groupadd scard
+[ \$? -eq 0 ] && adduser x2goclient scard
+[ \$? -eq 0 ] && update-initramfs -u -v
+[ \$? -eq 0 ] && passwd -l root
# tweak mtab diversion
-[ $? -eq 0 ] && mkdir /etc/mtab.tmp
-[ $? -eq 0 ] && ln -sf /etc/mtab /etc/mtab.tmp/mtab
+[ \$? -eq 0 ] && rm -f /etc/mtab
+[ \$? -eq 0 ] && mkdir /etc/mtab.tmp
+[ \$? -eq 0 ] && ln -sf /etc/mtab.tmp/mtab /etc/mtab
 
 umount -l /proc &>/dev/null
 umount -l /dev/pts &>/dev/null


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

    