x2go-commits September 2012

x2go-commits@lists.x2go.org

1 participants
231 discussions

x2gothinclient.git - master (branch) updated: 1.0.1.8-24-g3e2b724
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via 3e2b724b3c476b645b88bb6b0c59a26486b73136 (commit) from 3d032b2f626d8d7873472c79ab60b2bb028db838 (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 3e2b724b3c476b645b88bb6b0c59a26486b73136 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 22:54:06 2012 +0200 Make sure that kernel + initrd symlinks are relative symlinks. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 15e5181..edc2342 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - Drop i686 kernel support, use i486 kernel by default. In Debian wheezy we only find a 686-pae kernel which fails on some (virtual) hardware (e.g. virtualbox). + - Make sure that kernel + initrd symlinks are relative symlinks. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index d05cbf8..8e14e6b 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -155,8 +155,11 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get install syslinux locales -y [ \$? -eq 0 ] && dpkg-reconfigure locales [ \$? -eq 0 ] && apt-get install linux-image-486 -y -[ \$? -eq 0 ] && mv /vmlinuz /vmlinuz.486 -[ \$? -eq 0 ] && mv /initrd.img /initrd.img.486 +[ \$? -eq 0 ] && mv /vmlinuz /vmlinuz.486.tmp +[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /vmlinuz.486.tmp | sed 's@/boot@boot@') && ln -s \$LINK_TARGET /vmlinuz.486 && rm -f /vmlinuz.486.tmp +[ \$? -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 x2gothinclient x2gocdmanager x2gosmartcardrules x2gousbmount -y # blacklist kernel modules 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 - master (branch) updated: 1.0.1.8-23-g3d032b2
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via 3d032b2f626d8d7873472c79ab60b2bb028db838 (commit) from 1692e917cc85ab932aed7c2069b6a24972dc0ca6 (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 3d032b2f626d8d7873472c79ab60b2bb028db838 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 22:39:29 2012 +0200 Do not fail if proc or sysfs are already mounted within chroot. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 4 ++-- x2gothinclientmanagement/sbin/x2gothinclient_shell | 4 ++-- .../sbin/x2gothinclient_upgrade | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1ed0798..15e5181 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low entry. - Mount proc and sysfs from outside chroot, cleanly unmount both in case there are more than one mountpoints for sysfs or proc mounted. + - Do not fail if proc or sysfs are already mounted within chroot. - Allow thin client management (x2gothinclient_shell, x2gothinclient_upgrade) while thin clients are in use. - Disable kms for radeon and i915 graphics adapters. diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 0aa9cb8..d05cbf8 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -189,8 +189,8 @@ EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh mkdir -p $TC_CHROOT/{proc,dev,sys} -mount -tproc proc $TC_CHROOT/proc -mount -tsysfs sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc || true +mount -tsysfs sys $TC_CHROOT/sys || true chroot $TC_CHROOT /x2go_tce_install.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index ae6b55e..89cbbcf 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -93,8 +93,8 @@ EOF chmod u+x "$TC_CHROOT/x2go_tce_shell.sh" mkdir -p $TC_CHROOT/{proc,dev,sys} -mount -tproc proc $TC_CHROOT/proc -mount -tsysfs sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc || true +mount -tsysfs sys $TC_CHROOT/sys || true chroot "$TC_CHROOT" /x2go_tce_shell.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 2050c9e..f0c0307 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -92,8 +92,8 @@ EOF chmod u+x "$TC_CHROOT/x2go_tce_upgrade.sh" mkdir -p $TC_CHROOT/{proc,dev,sys} -mount -tproc proc $TC_CHROOT/proc -mount -tsysfs sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc || true +mount -tsysfs sys $TC_CHROOT/sys || true chroot "$TC_CHROOT" /x2go_tce_upgrade.sh 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 - master (branch) updated: 1.0.1.8-22-g1692e91
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via 1692e917cc85ab932aed7c2069b6a24972dc0ca6 (commit) from 65d460e62294a2ee9b27dfd6f2b8abd518596833 (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 1692e917cc85ab932aed7c2069b6a24972dc0ca6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 22:24:09 2012 +0200 Drop i686 kernel support, use i486 kernel by default. In Debian wheezy we only find a 686-pae kernel which fails on some (virtual) hardware (e.g. virtualbox). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ .../sbin/x2gothinclient_create | 3 --- .../share/tftpboot/x2go-tce.cfg | 8 ++------ 3 files changed, 5 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4bf2668..1ed0798 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - x2gothinclient_shell now does not affect boot behavious of the TCE machines anymore, thus, removing the notification output when launching the X2Go TCE maintenance shell. + - Drop i686 kernel support, use i486 kernel by default. In Debian wheezy + we only find a 686-pae kernel which fails on some (virtual) hardware (e.g. + virtualbox). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 378672b..0aa9cb8 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -157,9 +157,6 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get install linux-image-486 -y [ \$? -eq 0 ] && mv /vmlinuz /vmlinuz.486 [ \$? -eq 0 ] && mv /initrd.img /initrd.img.486 -[ \$? -eq 0 ] && apt-get install linux-image-686 -y -[ \$? -eq 0 ] && mv /vmlinuz /vmlinuz.686 -[ \$? -eq 0 ] && mv /initrd.img /initrd.img.686 [ \$? -eq 0 ] && apt-get install x2gothinclient x2gocdmanager x2gosmartcardrules x2gousbmount -y # blacklist kernel modules diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg b/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg index 9d38f11..c1f0b3a 100644 --- a/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg +++ b/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg @@ -1,8 +1,4 @@ -LABEL x2go-tce-686 +LABEL x2go-tce-486 MENU LABEL X2Go ^Thin Client - KERNEL vmlinuz.686 - APPEND initrd=initrd.img.686 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset -LABEL x2go-tce-486 - MENU LABEL X2Go ^Thin Client (old hardware) KERNEL vmlinuz.486 - APPEND initrd=initrd.img.486 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset + APPEND initrd=initrd.img.486 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset splash 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 - master (branch) updated: 1.0.1.8-21-g65d460e
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via 65d460e62294a2ee9b27dfd6f2b8abd518596833 (commit) from 61ef5f76438f263442d41ba3e8cff8725b4dfcca (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 65d460e62294a2ee9b27dfd6f2b8abd518596833 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 22:20:30 2012 +0200 Mount proc and sysfs from outside chroot, cleanly unmount both in case there are more than one mountpoints for sysfs or proc mounted. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- .../sbin/x2gothinclient_create | 5 ++--- x2gothinclientmanagement/sbin/x2gothinclient_shell | 9 ++++++--- .../sbin/x2gothinclient_upgrade | 5 ++--- 4 files changed, 12 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0988afa..4bf2668 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low got relocated to /run). - /etc/network/interfaces in wheezy already contains a loopback device entry. - - Cleanly unmount --bind mounts in case there are more than one. + - Mount proc and sysfs from outside chroot, cleanly unmount both in case + there are more than one mountpoints for sysfs or proc mounted. - Allow thin client management (x2gothinclient_shell, x2gothinclient_upgrade) while thin clients are in use. - Disable kms for radeon and i915 graphics adapters. diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 22ade73..378672b 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -192,9 +192,8 @@ EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh mkdir -p $TC_CHROOT/{proc,dev,sys} -mount --bind /proc $TC_CHROOT/proc -mount --bind /dev $TC_CHROOT/dev -mount --bind /sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc +mount -tsysfs sys $TC_CHROOT/sys chroot $TC_CHROOT /x2go_tce_install.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 974d966..ae6b55e 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -80,8 +80,12 @@ fi export X2GO_HANDLE_DAEMONS=false +mount /root + /bin/$TC_SHELL +umount /root + echo echo "X2go Thin Client Shell has exited." echo @@ -89,9 +93,8 @@ EOF chmod u+x "$TC_CHROOT/x2go_tce_shell.sh" mkdir -p $TC_CHROOT/{proc,dev,sys} -mount --bind /proc $TC_CHROOT/proc -mount --bind /dev $TC_CHROOT/dev -mount --bind /sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc +mount -tsysfs sys $TC_CHROOT/sys chroot "$TC_CHROOT" /x2go_tce_shell.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 218b4b9..2050c9e 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -92,9 +92,8 @@ EOF chmod u+x "$TC_CHROOT/x2go_tce_upgrade.sh" mkdir -p $TC_CHROOT/{proc,dev,sys} -mount --bind /proc $TC_CHROOT/proc -mount --bind /dev $TC_CHROOT/dev -mount --bind /sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc +mount -tsysfs sys $TC_CHROOT/sys chroot "$TC_CHROOT" /x2go_tce_upgrade.sh 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 - master (branch) updated: 1.0.1.8-20-g61ef5f7
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via 61ef5f76438f263442d41ba3e8cff8725b4dfcca (commit) from 779013fd2592efb947dbdc598e647809728c44a1 (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 61ef5f76438f263442d41ba3e8cff8725b4dfcca Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 21:33:28 2012 +0200 x2gothinclient_shell now does not affect boot behavious of the TCE machines anymore, thus, removing the notification output when launching the X2Go TCE maintenance shell. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2gothinclientmanagement/sbin/x2gothinclient_shell | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a0e4bfc..0988afa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - Allow thin client management (x2gothinclient_shell, x2gothinclient_upgrade) while thin clients are in use. - Disable kms for radeon and i915 graphics adapters. + - x2gothinclient_shell now does not affect boot behavious of the TCE + machines anymore, thus, removing the notification output when + launching the X2Go TCE maintenance shell. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 9dfeaaa..974d966 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -63,8 +63,6 @@ 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 # migrate start-stop-daemon to wrapper & variable based start-stop-daemon execution if [ \$(stat --format '%s' /sbin/start-stop-daemon) -gt 200 ]; then 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 - master (branch) updated: 1.0.1.8-19-g779013f
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via 779013fd2592efb947dbdc598e647809728c44a1 (commit) from 0f565d4614affd6bafec0949ff049cff9f34c32f (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 779013fd2592efb947dbdc598e647809728c44a1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 21:29:30 2012 +0200 fix unmounting of proc, sys and dev ----------------------------------------------------------------------- Summary of changes: .../sbin/x2gothinclient_create | 4 ++-- x2gothinclientmanagement/sbin/x2gothinclient_shell | 4 ++-- .../sbin/x2gothinclient_upgrade | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 97b2443..22ade73 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -199,8 +199,8 @@ mount --bind /sys $TC_CHROOT/sys chroot $TC_CHROOT /x2go_tce_install.sh for mountpoint in proc dev sys; do - while 1; do - cat /proc/mounts | grep $TC_CHROOT/$mountpoint && umount $TC_CHROOT/$mountpoint || break + while true; do + cat /proc/mounts | grep $TC_CHROOT/$mountpoint >/dev/null && umount $TC_CHROOT/$mountpoint || break done done diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 18e4755..9dfeaaa 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -98,7 +98,7 @@ mount --bind /sys $TC_CHROOT/sys chroot "$TC_CHROOT" /x2go_tce_shell.sh for mountpoint in proc dev sys; do - while 1; do - cat /proc/mounts | grep $TC_CHROOT/$mountpoint && umount $TC_CHROOT/$mountpoint || break + while true; do + cat /proc/mounts | grep $TC_CHROOT/$mountpoint >/dev/null && umount $TC_CHROOT/$mountpoint || break done done diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 52fd92a..218b4b9 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -99,7 +99,7 @@ mount --bind /sys $TC_CHROOT/sys chroot "$TC_CHROOT" /x2go_tce_upgrade.sh for mountpoint in proc dev sys; do - while 1; do - cat /proc/mounts | grep $TC_CHROOT/$mountpoint && umount $TC_CHROOT/$mountpoint || break + while true; do + cat /proc/mounts | grep $TC_CHROOT/$mountpoint >/dev/null && umount $TC_CHROOT/$mountpoint || break done done 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 - master (branch) updated: 1.0.1.8-18-g0f565d4
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via 0f565d4614affd6bafec0949ff049cff9f34c32f (commit) from a49e0b5666a43718026ac515d36ee00d1a531989 (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 0f565d4614affd6bafec0949ff049cff9f34c32f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 21:21:54 2012 +0200 Disable kms for radeon and i915 graphics adapters. ----------------------------------------------------------------------- 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 2a2239d..a0e4bfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - Cleanly unmount --bind mounts in case there are more than one. - Allow thin client management (x2gothinclient_shell, x2gothinclient_upgrade) while thin clients are in use. + - Disable kms for radeon and i915 graphics adapters. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 8a2aee9..97b2443 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -185,6 +185,8 @@ export X2GO_HANDLE_DAEMONS=false # tweak plymouth [ \$? -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/nomodeset/' -i /etc/modprobe.d/i915-kms.conf +[ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/nomodeset/' -i /etc/modprobe.d/radeon-kms.conf EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh 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 - master (branch) updated: 1.0.1.8-17-ga49e0b5
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via a49e0b5666a43718026ac515d36ee00d1a531989 (commit) from e2759c3216ada716ddfbdc6af6c4cc9a59481d84 (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 a49e0b5666a43718026ac515d36ee00d1a531989 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 21:18:42 2012 +0200 fix for commit 50ac97e71bbbfef035df648e3fef4e5ddc0369cd ----------------------------------------------------------------------- Summary of changes: .../sbin/x2gothinclient_create | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index be10ab9..8a2aee9 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -87,7 +87,6 @@ echo "127.0.0.1 localhost" >> $TC_CHROOT/etc/hosts 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 none /etc/udev/rules.d tmpfs size=50M 0 0 @@ -105,6 +104,7 @@ if [ "$TC_DISTRO_CODENAME" = "squeeze" ]; then cat >> $TC_CHROOT/etc/fstab <<EOF none /var/run tmpfs size=50M 0 0 none /var/lock tmpfs size=50M 0 0 +none /dev/pts devpts gid=5,mode=620 0 0 EOF elif [ "$TC_DISTRO_CODENAME" = "wheezy" ]; then cat >> $TC_CHROOT/etc/fstab <<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 - master (branch) updated: 1.0.1.8-16-ge2759c3
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via e2759c3216ada716ddfbdc6af6c4cc9a59481d84 (commit) via d6fe083e37c89ef060244c8f959e8b7a68279e6a (commit) from 9f416ebe9cf60c6fdd4d3e273b0c60c974e2ac3c (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 e2759c3216ada716ddfbdc6af6c4cc9a59481d84 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 21:17:24 2012 +0200 Allow thin client management (x2gothinclient_shell, x2gothinclient_upgrade) while thin clients are in use. commit d6fe083e37c89ef060244c8f959e8b7a68279e6a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 20:28:45 2012 +0200 Cleanly unmount --bind mounts in case there are more than one. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ .../sbin/x2gothinclient_create | 25 ++++++++++----- x2gothinclientmanagement/sbin/x2gothinclient_shell | 32 ++++++++++++------- .../sbin/x2gothinclient_upgrade | 29 ++++++++++++----- 4 files changed, 59 insertions(+), 30 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7e21578..2a2239d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low got relocated to /run). - /etc/network/interfaces in wheezy already contains a loopback device entry. + - Cleanly unmount --bind mounts in case there are more than one. + - Allow thin client management (x2gothinclient_shell, x2gothinclient_upgrade) + while thin clients are in use. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index bda5a73..be10ab9 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -129,11 +129,19 @@ mkdir -p /etc/network ln -sf /dev/shm /etc/network/run # disable service restarts -test -e /sbin/start-stop-daemon.keep || mv /sbin/start-stop-daemon /sbin/start-stop-daemon.keep -echo '#!/bin/sh' > /sbin/start-stop-daemon -echo 'exit 0' >> /sbin/start-stop-daemon +test -e /sbin/start-stop-daemon.real || mv /sbin/start-stop-daemon /sbin/start-stop-daemon.real +echo '#!/bin/sh' > /sbin/start-stop-daemon +echo '#' >> /sbin/start-stop-daemon +echo '# X2Go Wrapper to avoid running daemons while performing maintenance.' >> /sbin/start-stop-daemon +echo '#' >> /sbin/start-stop-daemon +echo >> /sbin/start-stop-daemon +echo 'if [ "\$X2GO_HANDLE_DAEMONS" != "false" ]; then' >> /sbin/start-stop-daemon +echo ' /sbin/start-stop-daemon.real "\$@"' >> /sbin/start-stop-daemon +echo 'fi' >> /sbin/start-stop-daemon chmod +x /sbin/start-stop-daemon +export X2GO_HANDLE_DAEMONS=false + [ \$? -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 @@ -178,9 +186,6 @@ chmod +x /sbin/start-stop-daemon # tweak plymouth [ \$? -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 -# restore start-stop-daemon -[ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon - EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh @@ -191,9 +196,11 @@ mount --bind /sys $TC_CHROOT/sys chroot $TC_CHROOT /x2go_tce_install.sh -umount $TC_CHROOT/proc -umount $TC_CHROOT/dev -umount $TC_CHROOT/sys +for mountpoint in proc dev sys; do + while 1; do + cat /proc/mounts | grep $TC_CHROOT/$mountpoint && umount $TC_CHROOT/$mountpoint || break + done +done rm -f $TC_CHROOT/etc/udev/rules.d/*-persistent-*.rules diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 67a8203..18e4755 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -66,16 +66,23 @@ echo echo 'Note: Service restarts have been disabled in X2Go TCE chroot.' echo -# disable service restarts -test -e /sbin/start-stop-daemon.keep || 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 +# migrate start-stop-daemon to wrapper & variable based start-stop-daemon execution +if [ \$(stat --format '%s' /sbin/start-stop-daemon) -gt 200 ]; then + cp /sbin/start-stop-daemon /sbin/start-stop-daemon.real + echo '#!/bin/sh' > /sbin/start-stop-daemon + echo '#' >> /sbin/start-stop-daemon + echo '# X2Go Wrapper to avoid running daemons while performing maintenance.' >> /sbin/start-stop-daemon + echo '#' >> /sbin/start-stop-daemon + echo >> /sbin/start-stop-daemon + echo 'if [ "\$X2GO_HANDLE_DAEMONS" != "false" ]; then' >> /sbin/start-stop-daemon + echo ' /sbin/start-stop-daemon.real "\$@"' >> /sbin/start-stop-daemon + echo 'fi' >> /sbin/start-stop-daemon + chmod a+x /sbin/start-stop-daemon +fi -/bin/$TC_SHELL +export X2GO_HANDLE_DAEMONS=false -# restore start-stop-daemon -[ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon +/bin/$TC_SHELL echo echo "X2go Thin Client Shell has exited." @@ -90,7 +97,8 @@ mount --bind /sys $TC_CHROOT/sys chroot "$TC_CHROOT" /x2go_tce_shell.sh -umount $TC_CHROOT/proc -umount $TC_CHROOT/dev -umount $TC_CHROOT/sys - +for mountpoint in proc dev sys; do + while 1; do + cat /proc/mounts | grep $TC_CHROOT/$mountpoint && umount $TC_CHROOT/$mountpoint || break + done +done diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 8f8c61e..52fd92a 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -54,11 +54,21 @@ export http_proxy=$TC_HTTP_PROXY export https_proxy=$TC_HTTPS_PROXY export ftp_proxy=$TC_FTP_PROXY -# disable service restarts -test -e /sbin/start-stop-daemon.keep || 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 +# migrate start-stop-daemon to wrapper & variable based start-stop-daemon execution +if [ \$(stat --format '%s' /sbin/start-stop-daemon) -gt 200 ]; then + cp /sbin/start-stop-daemon /sbin/start-stop-daemon.real + echo '#!/bin/sh' > /sbin/start-stop-daemon + echo '#' >> /sbin/start-stop-daemon + echo '# X2Go Wrapper to avoid running daemons while performing maintenance.' >> /sbin/start-stop-daemon + echo '#' >> /sbin/start-stop-daemon + echo >> /sbin/start-stop-daemon + echo 'if [ "\$X2GO_HANDLE_DAEMONS" != "false" ]; then' >> /sbin/start-stop-daemon + echo ' /sbin/start-stop-daemon.real "\$@"' >> /sbin/start-stop-daemon + echo 'fi' >> /sbin/start-stop-daemon + chmod a+x /sbin/start-stop-daemon +fi + +export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get update [ \$? -eq 0 ] && apt-get upgrade @@ -88,7 +98,8 @@ mount --bind /sys $TC_CHROOT/sys chroot "$TC_CHROOT" /x2go_tce_upgrade.sh -umount $TC_CHROOT/proc -umount $TC_CHROOT/dev -umount $TC_CHROOT/sys - +for mountpoint in proc dev sys; do + while 1; do + cat /proc/mounts | grep $TC_CHROOT/$mountpoint && umount $TC_CHROOT/$mountpoint || break + done +done 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 - master (branch) updated: 1.0.1.8-14-g9f416eb
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via 9f416ebe9cf60c6fdd4d3e273b0c60c974e2ac3c (commit) via cf8bce82ec7a9bf42b29bd7b79a812df215c233f (commit) via 50ac97e71bbbfef035df648e3fef4e5ddc0369cd (commit) via 3328fca6529c9c43ca19083ab8d090cd84f36de3 (commit) from 88c3ab78a7b4e3e6205173fc4a4b4b6070d0143e (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 9f416ebe9cf60c6fdd4d3e273b0c60c974e2ac3c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 18:42:43 2012 +0200 /etc/network/interfaces in wheezy already contains a loopback device entry. commit cf8bce82ec7a9bf42b29bd7b79a812df215c233f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 18:37:53 2012 +0200 drop /run/lock as mountpoint on wheezy TCEs commit 50ac97e71bbbfef035df648e3fef4e5ddc0369cd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 18:36:28 2012 +0200 Handle /etc/fstab in TCE chroot differently for squeeze and wheezy (/dev/pts does not need an entry in fstab on wheezy systems, /var/run got relocated to /run). commit 3328fca6529c9c43ca19083ab8d090cd84f36de3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Aug 23 15:54:24 2012 +0200 Symlink /etc/mtab to /proc/mounts before installing any kernel during the chroot creation process. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 ++++ .../sbin/x2gothinclient_create | 31 ++++++++++++++------ 2 files changed, 29 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4119c32..7e21578 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,13 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - Fix x2go_tce_shell.sh script, escape braces. - Change method of mounting /proc, /sys and /dev inside of chroots. - Step towards wheezy, enable plymouth boot splash. + - Symlink /etc/mtab to /proc/mounts before installing any kernel + during the chroot creation process. + - Handle /etc/fstab in TCE chroot differently for squeeze and wheezy + (/dev/pts does not need an entry in fstab on wheezy systems, /var/run + got relocated to /run). + - /etc/network/interfaces in wheezy already contains a loopback device + entry. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index d88ab5a..bda5a73 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -78,19 +78,20 @@ export ftp_proxy="$TC_FTP_PROXY" debootstrap --arch i386 $TC_DISTRO_CODENAME $TC_CHROOT/ $TC_DEBMIRROR_URL cp /etc/resolv.conf $TC_CHROOT/etc/resolv.conf -echo "auto lo" >> $TC_CHROOT/etc/network/interfaces -echo "iface lo inet loopback" >> $TC_CHROOT/etc/network/interfaces +if [ "$TC_DISTRO_CODENAME" = "squeeze" ]; then + echo "auto lo" >> $TC_CHROOT/etc/network/interfaces + echo "iface lo inet loopback" >> $TC_CHROOT/etc/network/interfaces +fi 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 +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 none /etc/udev/rules.d 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 none /home tmpfs size=50M 0 0 none /media tmpfs size=50M 0 0 none /var/lib/nfs tmpfs size=50M 0 0 @@ -99,6 +100,17 @@ none /var/lib/dbus tmpfs size=50M 0 0 none /var/lib/alsa tmpfs size=50M 0 0 EOF +# differences between Debian versions +if [ "$TC_DISTRO_CODENAME" = "squeeze" ]; then + cat >> $TC_CHROOT/etc/fstab <<EOF +none /var/run tmpfs size=50M 0 0 +none /var/lock tmpfs size=50M 0 0 +EOF +elif [ "$TC_DISTRO_CODENAME" = "wheezy" ]; then + cat >> $TC_CHROOT/etc/fstab <<EOF +none /run tmpfs size=50M 0 0 +EOF +fi cat > $TC_CHROOT/x2go_tce_install.sh <<EOF #!/bin/bash @@ -125,6 +137,11 @@ 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 + +# tweak mtab diversion +[ \$? -eq 0 ] && rm -f /etc/mtab +[ \$? -eq 0 ] && ln -sf /proc/mounts /etc/mtab + [ \$? -eq 0 ] && apt-get update [ \$? -eq 0 ] && apt-get install $TC_SHELL -y [ \$? -eq 0 ] && apt-get install syslinux locales -y @@ -158,10 +175,6 @@ chmod +x /sbin/start-stop-daemon [ \$? -eq 0 ] && update-initramfs -u -v [ \$? -eq 0 ] && passwd -l root -# tweak mtab diversion -[ \$? -eq 0 ] && rm -f /etc/mtab -[ \$? -eq 0 ] && ln -sf /proc/mounts /etc/mtab - # tweak plymouth [ \$? -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 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:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2012