The branch, master has been updated via 3b08dec260d17a2983bbc0983bb175a9b60f3b3d (commit) via dbc9bdb36ddfd5ebab14cc07e89f74dc138a9bce (commit) via 92893bd0ac14c9b7d6288e50f64b450f3daed352 (commit) from 940ac2f46b3542afce98981209364860e9b0e47d (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 3b08dec260d17a2983bbc0983bb175a9b60f3b3d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 29 15:23:46 2011 +0200 Add detection of kernel upgrades to x2gothinclient_upgrade script. commit dbc9bdb36ddfd5ebab14cc07e89f74dc138a9bce Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 29 15:10:06 2011 +0200 Move kernel/initrd symlinks after install rather than copying. commit 92893bd0ac14c9b7d6288e50f64b450f3daed352 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 29 15:09:11 2011 +0200 Some more verbosity... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ .../sbin/x2gothinclient_create | 9 ++++----- x2gothinclientmanagement/sbin/x2gothinclient_shell | 4 ++++ .../sbin/x2gothinclient_update | 2 ++ .../sbin/x2gothinclient_upgrade | 13 +++++++++++++ 5 files changed, 25 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7a854c5..9a43961 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low * Reduce x2goclient CPU load from ~100% to ~0-1%. * Boot TCE kernel with nomodeset boot option to avoid gCard incompatibilities (Fb vs. Xorg). + * Move kernel/initrd symlinks after install rather than copying. + * Add detection of kernel upgrades to x2gothinclient_upgrade script. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 28 May 2011 12:04:34 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 5297530..39213ba 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -126,11 +126,11 @@ chmod +x /sbin/start-stop-daemon [ \$? -eq 0 ] && apt-get install syslinux locales -y [ \$? -eq 0 ] && dpkg-reconfigure locales [ \$? -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 ] && mv /vmlinuz /vmlinuz.486 +[ \$? -eq 0 ] && mv /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 ] && 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 @@ -178,4 +178,3 @@ x2gothinclient_update echo echo "X2go Thin Client creation has finished successfully." echo - diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 19c19c5..2712320 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -80,6 +80,10 @@ chmod +x /sbin/start-stop-daemon umount -l /proc &> /dev/null umount -l /dev/pts &> /dev/null + +echo +echo "X2go Thin Client Shell has exited." +echo EOF chmod u+x "$TC_CHROOT/x2go_tce_shell.sh" chroot "$TC_CHROOT" /x2go_tce_shell.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_update b/x2gothinclientmanagement/sbin/x2gothinclient_update index d0e78bc..4f65ffa 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_update +++ b/x2gothinclientmanagement/sbin/x2gothinclient_update @@ -66,4 +66,6 @@ chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_start" cp -v "$TC_CONFIG/x2gothinclient_sessions" "$TC_CHROOT/etc/x2go/x2gothinclient_sessions" chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_sessions" +echo +echo "X2go Thin Client configuration update complete." echo \ No newline at end of file diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 6391d0f..a15d851 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -64,11 +64,24 @@ chmod +x /sbin/start-stop-daemon [ \$? -eq 0 ] && apt-get update [ \$? -eq 0 ] && apt-get upgrade +# check for kernel upgrades +for symlink in /vmlinuz /initrd.img; do + if [ -h $symlink ]; then + symlink_target=$(ls -l "$symlink" | awk '{print $11}') + echo $symlink_target | grep 486 >/dev/null && mv $symlink $symlink.486 + echo $symlink_target | grep 686 >/dev/null && mv $symlink $symlink.686 + fi +done + # 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 + +echo +echo "X2go Thin Client Shell upgrade has finished." +echo EOF chmod u+x "$TC_CHROOT/x2go_tc_update.sh" chroot "$TC_CHROOT" /x2go_tc_update.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).