x2go-commits June 2011

x2go-commits@lists.x2go.org

1 participants
236 discussions

x2gothinclient.git - tmpfs (branch) updated: c1611ea520a29eaf6db280cdcc0117046046fa1f
by git-admin＠x2go.org 17 Jun '11

17 Jun '11

The branch, tmpfs has been updated via c1611ea520a29eaf6db280cdcc0117046046fa1f (commit) from 4ff01d83653fb0f2d134d0785ec82c14ebcc716d (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 c1611ea520a29eaf6db280cdcc0117046046fa1f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 18 00:42:10 2011 +0200 quote fix ----------------------------------------------------------------------- Summary of changes: x2gothinclientmanagement/sbin/x2gothinclient_shell | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index d9e97e5..e6f62aa 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -64,7 +64,7 @@ echo echo "To return from this chroot shell hit STRG+D or type ,,exit'' on the" echo 'command line...' echo -echo 'Note: Service restarts have been disabled in X2go TCE chroot." +echo 'Note: Service restarts have been disabled in X2go TCE chroot.' echo # disable service restarts 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 - tmpfs (branch) updated: 4ff01d83653fb0f2d134d0785ec82c14ebcc716d
by git-admin＠x2go.org 17 Jun '11

17 Jun '11

The branch, tmpfs has been updated via 4ff01d83653fb0f2d134d0785ec82c14ebcc716d (commit) from 7b885782f35dc55590c24999cf38ca0b693eb75f (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 4ff01d83653fb0f2d134d0785ec82c14ebcc716d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 18 00:38:28 2011 +0200 Add tmpfs mount for /var/lib/dbus. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9546a4b..d4f40b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low * Add some more PXE/TFTP info at end of x2gothinclient_pretftpboot script. * Disabled service restarts in chroot. * Add a ,,hit <RETURN> before TCE creation. + * Add tmpfs mount for /var/lib/dbus. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 May 2011 12:04:34 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 115ec18..de553de 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -92,6 +92,7 @@ none /home tmpfs size=50M 0 0 none /media tmpfs size=50M 0 0 none /var/lib/nfs tmpfs size=50M 0 0 none /var/lib/xkb tmpfs size=50M 0 0 +none /var/lib/dbus tmpfs size=50M 0 0 EOF @@ -109,6 +110,7 @@ export ftp_proxy=$TC_FTP_PROXY mkdir -p /tmp/user/0 mkdir -p /var/lib/xkb mkdir -p /var/lib/nfs +mkdir -p /var/lib/dbus # disable service restarts mv /sbin/start-stop-daemon /sbin/start-stop-daemon.keep 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 - tmpfs (branch) updated: 7b885782f35dc55590c24999cf38ca0b693eb75f
by git-admin＠x2go.org 17 Jun '11

17 Jun '11

The branch, tmpfs has been updated via 7b885782f35dc55590c24999cf38ca0b693eb75f (commit) from 13078d54c13c34cebc8efc1f4265fc005930dadc (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 7b885782f35dc55590c24999cf38ca0b693eb75f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 18 00:29:37 2011 +0200 Add a ,,hit <RETURN> before TCE creation. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4839f3b..9546a4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low * Tweak mtab diversion on X2go Thin Client to avoid error messages. * Add some more PXE/TFTP info at end of x2gothinclient_pretftpboot script. * Disabled service restarts in chroot. + * Add a ,,hit <RETURN> before TCE creation. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 May 2011 12:04:34 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 21937ae..115ec18 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -53,6 +53,10 @@ test -e "$TC_CHROOT" && { exit -2 } +echo "Hit <RETURN> to continue with X2go TCE chroot creation using the above TCE parameters..." +echo "Alternatively, hit STRG-C to cancel the operation now!!!" +read + export LANG=C mkdir -p $TC_CONFIG 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 - tmpfs (branch) updated: 13078d54c13c34cebc8efc1f4265fc005930dadc
by git-admin＠x2go.org 17 Jun '11

17 Jun '11

The branch, tmpfs has been updated via 13078d54c13c34cebc8efc1f4265fc005930dadc (commit) from eca2aae1a342cd1ec352cd329b216ab28317f629 (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 13078d54c13c34cebc8efc1f4265fc005930dadc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 18 00:20:45 2011 +0200 extra line breaks ----------------------------------------------------------------------- Summary of changes: .../sbin/x2gothinclient_create | 3 ++- .../sbin/x2gothinclient_preptftpboot | 3 ++- x2gothinclientmanagement/sbin/x2gothinclient_shell | 3 ++- .../sbin/x2gothinclient_update | 3 ++- .../sbin/x2gothinclient_upgrade | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index a71bf6e..21937ae 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -43,7 +43,8 @@ TC_X2GO_DEBURL="${TC_X2GO_DEBURL:-'deb http://packages.x2go.org stable main'}" TC_MODULE_BLACKLIST="${TC_MODULE_BLACKLIST:-'pcspkr'}" test -e "$TC_CHROOT" && { - echo "ERROR: X2go Thin Client chroot already exists at $TC_CHROOT. Clear $TC_BASE/ and then run $(basename $0) again..." + echo "ERROR: X2go Thin Client chroot already exists at $TC_CHROOT." + echo "Clear $TC_BASE/ and then run $(basename $0) again..." exit -1 } diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot index 08edcc8..5b64d70 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot +++ b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot @@ -43,7 +43,8 @@ TC_TFTP_BOOT="${TC_TFTP_BOOT:-/srv/tftp}" mkdir -p "$TC_TFTP_BOOT" test -e "$TC_TFTP_BOOT/pxelinux.cfg" && { - echo "PXE boot files already found at $TC_TFTP_BOOT. Clear $TC_TFTP_BOOT/ and then run $(basename $0) again..." + echo "PXE boot files already found at $TC_TFTP_BOOT." + echo "Clear $TC_TFTP_BOOT/ and then run $(basename $0) again..." exit -1 } diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index c3fd580..d9e97e5 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -36,7 +36,8 @@ TC_SHELL="${TC_SHELL:-/bin/bash}" TC_CHROOT="${TC_CHROOT:-/opt/x2gothinclient}" test -e "$TC_CHROOT" || { - echo "ERROR: X2go Thin Client chroot does not exist at $TC_CHROOT. Run x2gothinclient_create to create it..." + echo "ERROR: X2go Thin Client chroot does not exist at $TC_CHROOT." + echo "Run x2gothinclient_create to create it..." exit -1 } diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_update b/x2gothinclientmanagement/sbin/x2gothinclient_update index 443b388..d0e78bc 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_update +++ b/x2gothinclientmanagement/sbin/x2gothinclient_update @@ -37,7 +37,8 @@ TC_CHROOT="${TC_CHROOT:-$TC_BASE/chroot}" TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}" test -e "$TC_CHROOT" || { - echo "ERROR: X2go Thin Client chroot does not exist at $TC_CHROOT. Run x2gothinclient_create to create it..." + echo "ERROR: X2go Thin Client chroot does not exist at $TC_CHROOT." + echo "Run x2gothinclient_create to create it..." exit -1 } diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 04bdf3d..4a8e6f5 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -35,7 +35,8 @@ source $ETCDIR/x2gothinclient_settings TC_CHROOT="${TC_CHROOT:-/opt/x2gothinclient}" test -e "$TC_CHROOT" || { - echo "ERROR: X2go Thin Client chroot does not exist at $TC_CHROOT. Run x2gothinclient_create to create it..." + echo "ERROR: X2go Thin Client chroot does not exist at $TC_CHROOT." + echo "Run x2gothinclient_create to create it..." exit -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 - tmpfs (branch) updated: eca2aae1a342cd1ec352cd329b216ab28317f629
by git-admin＠x2go.org 17 Jun '11

17 Jun '11

The branch, tmpfs has been updated via eca2aae1a342cd1ec352cd329b216ab28317f629 (commit) from 10589b8bb5b1bab7d230dc369ca7c5b021d21c6d (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 eca2aae1a342cd1ec352cd329b216ab28317f629 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 17 19:25:22 2011 +0200 Trying to symlink /etc/mtab to /proc/mounts (should work with /etc/init.d/mtab.sh on Debian squeeze) ----------------------------------------------------------------------- Summary of changes: .../sbin/x2gothinclient_create | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 78c9313..a71bf6e 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -80,7 +80,6 @@ none /tmp tmpfs size=50M,mode=1777 0 0 none /root tmpfs size=100M,mode=700 0 0 none /etc/network/run tmpfs size=50M 0 0 none /etc/udev/rules.d tmpfs size=50M 0 0 -none /etc/mtab.tmp tmpfs size=50M 0 0 none /var/run tmpfs size=50M 0 0 none /var/log tmpfs size=50M 0 0 none /var/lock tmpfs size=50M 0 0 @@ -154,8 +153,7 @@ PATCH # tweak mtab diversion [ \$? -eq 0 ] && rm -f /etc/mtab -[ \$? -eq 0 ] && mkdir /etc/mtab.tmp -[ \$? -eq 0 ] && ln -sf /etc/mtab.tmp/mtab /etc/mtab +[ \$? -eq 0 ] && ln -sf /proc/mounts /etc/mtab # restore start-stop-daemon [ `stat --format '%s' /sbin/start-stop-daemon` -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon 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 - tmpfs (branch) updated: 10589b8bb5b1bab7d230dc369ca7c5b021d21c6d
by git-admin＠x2go.org 16 Jun '11

16 Jun '11

The branch, tmpfs has been updated via 10589b8bb5b1bab7d230dc369ca7c5b021d21c6d (commit) from b08e83263be755335067305f55956ff0f25b97d3 (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 10589b8bb5b1bab7d230dc369ca7c5b021d21c6d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 16 23:25:21 2011 +0200 Fix for mount error while mounting procfs. ----------------------------------------------------------------------- Summary of changes: .../sbin/x2gothinclient_create | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 269caca..78c9313 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -73,8 +73,8 @@ echo "auto lo" >> $TC_CHROOT/etc/network/interfaces echo "iface lo inet loopback" >> $TC_CHROOT/etc/network/interfaces echo "x2gothinclient" > $TC_CHROOT/etc/hostname echo "127.0.0.1 localhost" >> $TC_CHROOT/etc/hosts -cat >> $TC_CHROOT/etc/fstab <<EOF -proc /proc proc defaults 0 0 +cat > $TC_CHROOT/etc/fstab <<EOF +#proc /proc proc defaults 0 0 none /dev/pts devpts gid=5,mode=620 0 0 none /tmp tmpfs size=50M,mode=1777 0 0 none /root tmpfs size=100M,mode=700 0 0 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 - tmpfs (branch) updated: b08e83263be755335067305f55956ff0f25b97d3
by git-admin＠x2go.org 16 Jun '11

16 Jun '11

The branch, tmpfs has been updated via b08e83263be755335067305f55956ff0f25b97d3 (commit) from 578dfcee35b5738b39916a18e289c85490c14c5f (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 b08e83263be755335067305f55956ff0f25b97d3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 16 22:49:52 2011 +0200 Fix start-stop-daemon dummy script creation. ----------------------------------------------------------------------- Summary of changes: x2gothinclientmanagement/sbin/x2gothinclient_shell | 2 +- .../sbin/x2gothinclient_upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index dd383c6..c3fd580 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -69,7 +69,7 @@ echo # disable service restarts mv /sbin/start-stop-daemon /sbin/start-stop-daemon.keep echo '#!/bin/sh' > /sbin/start-stop-daemon -echo 'exit 0' > /sbin/start-stop-daemon +echo 'exit 0' >> /sbin/start-stop-daemon chmod +x /sbin/start-stop-daemon /bin/$TC_SHELL diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 140df41..04bdf3d 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -57,7 +57,7 @@ export ftp_proxy=$TC_FTP_PROXY # disable service restarts mv /sbin/start-stop-daemon /sbin/start-stop-daemon.keep echo '#!/bin/sh' > /sbin/start-stop-daemon -echo 'exit 0' > /sbin/start-stop-daemon +echo 'exit 0' >> /sbin/start-stop-daemon chmod +x /sbin/start-stop-daemon [ $? -eq 0 ] && apt-get update 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 - tmpfs (branch) updated: 578dfcee35b5738b39916a18e289c85490c14c5f
by git-admin＠x2go.org 16 Jun '11

16 Jun '11

The branch, tmpfs has been updated via 578dfcee35b5738b39916a18e289c85490c14c5f (commit) from b992334c44aa715b0480baf8f23d9dec28f760e3 (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 578dfcee35b5738b39916a18e289c85490c14c5f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 16 22:48:54 2011 +0200 Disable service restarts during x2gothinclient_create. ----------------------------------------------------------------------- Summary of changes: .../sbin/x2gothinclient_create | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 3e7f195..269caca 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -105,7 +105,13 @@ export ftp_proxy=$TC_FTP_PROXY 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 + +# disable service restarts +mv /sbin/start-stop-daemon /sbin/start-stop-daemon.keep +echo '#!/bin/sh' > /sbin/start-stop-daemon +echo 'exit 0' >> /sbin/start-stop-daemon +chmod +x /sbin/start-stop-daemon + [ \$? -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 @@ -151,6 +157,9 @@ PATCH [ \$? -eq 0 ] && mkdir /etc/mtab.tmp [ \$? -eq 0 ] && ln -sf /etc/mtab.tmp/mtab /etc/mtab +# restore start-stop-daemon +[ `stat --format '%s' /sbin/start-stop-daemon` -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon + umount -l /proc &>/dev/null umount -l /dev/pts &>/dev/null EOF 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 - tmpfs (branch) updated: b992334c44aa715b0480baf8f23d9dec28f760e3
by git-admin＠x2go.org 16 Jun '11

16 Jun '11

The branch, tmpfs has been updated via b992334c44aa715b0480baf8f23d9dec28f760e3 (commit) from 414bd8e66fb3351e8eb9740e2e685fac34331a9d (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 b992334c44aa715b0480baf8f23d9dec28f760e3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 16 22:37:25 2011 +0200 Disabled service restarts in chroot. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gothinclientmanagement/sbin/x2gothinclient_shell | 8 ++++++++ .../sbin/x2gothinclient_upgrade | 9 +++++++++ 3 files changed, 18 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 26d9403..4839f3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low * Add kernel module blacklisting for x2gothinclient_create. * Tweak mtab diversion on X2go Thin Client to avoid error messages. * Add some more PXE/TFTP info at end of x2gothinclient_pretftpboot script. + * Disabled service restarts in chroot. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 May 2011 12:04:34 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index fe0cd4d..dd383c6 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -63,6 +63,14 @@ echo echo "To return from this chroot shell hit STRG+D or type ,,exit'' on the" echo 'command line...' echo +echo 'Note: Service restarts have been disabled in X2go TCE chroot." +echo + +# disable service restarts +mv /sbin/start-stop-daemon /sbin/start-stop-daemon.keep +echo '#!/bin/sh' > /sbin/start-stop-daemon +echo 'exit 0' > /sbin/start-stop-daemon +chmod +x /sbin/start-stop-daemon /bin/$TC_SHELL diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index e345d5d..140df41 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -54,9 +54,18 @@ export http_proxy=$TC_HTTP_PROXY export https_proxy=$TC_HTTPS_PROXY export ftp_proxy=$TC_FTP_PROXY +# disable service restarts +mv /sbin/start-stop-daemon /sbin/start-stop-daemon.keep +echo '#!/bin/sh' > /sbin/start-stop-daemon +echo 'exit 0' > /sbin/start-stop-daemon +chmod +x /sbin/start-stop-daemon + [ $? -eq 0 ] && apt-get update [ $? -eq 0 ] && apt-get upgrade +# restore start-stop-daemon +[ `stat --format '%s' /sbin/start-stop-daemon` -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon + umount -l /proc &> /dev/null umount -l /dev/pts &> /dev/null EOF 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 - tmpfs (branch) updated: 414bd8e66fb3351e8eb9740e2e685fac34331a9d
by git-admin＠x2go.org 16 Jun '11

16 Jun '11

The branch, tmpfs has been updated via 414bd8e66fb3351e8eb9740e2e685fac34331a9d (commit) from f6100fbaa0f39bc4ebf0a9ecf2c2db6a964c946b (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 414bd8e66fb3351e8eb9740e2e685fac34331a9d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 16 22:15:16 2011 +0200 re-arranging line breaks ----------------------------------------------------------------------- Summary of changes: x2gothinclientmanagement/sbin/x2gothinclient_shell | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index e6e737a..fe0cd4d 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -56,10 +56,12 @@ export http_proxy=$TC_HTTP_PROXY export https_proxy=$TC_HTTPS_PROXY export ftp_proxy=$TC_FTP_PROXY -echo 'This shell has been started in your X2go Thin Clients chroot environment. All changes performed here' -echo 'will take effect on your X2go Thin Clients after their next (re)boot. So be careful!!!' +echo 'This shell has been started in your X2go Thin Clients chroot environment.' +echo 'All changes performed here will take effect on your X2go Thin Clients' +echo 'after their next (re)boot. So be careful!!!' echo -echo "To return from this chroot shell hit STRG+D or type ,,exit'' on the command line..." +echo "To return from this chroot shell hit STRG+D or type ,,exit'' on the" +echo 'command line...' echo /bin/$TC_SHELL 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

← Newer
1
...
13
14
15
16
17
18
19
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits June 2011