The branch, master has been updated via 13467ff99ffe11ef1d106a636efdb72a0147bc2b (commit) via 31edbd9cdd5574432aafe788a47a439a5800accf (commit) from 3b08dec260d17a2983bbc0983bb175a9b60f3b3d (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 13467ff99ffe11ef1d106a636efdb72a0147bc2b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 29 21:29:30 2011 +0200 output beautifications... commit 31edbd9cdd5574432aafe788a47a439a5800accf Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 29 21:27:58 2011 +0200 handle vmlinuz.old/initrd.img.old as well (in case 486 _and_ 686 kernel gets upgraded at the same time) ----------------------------------------------------------------------- Summary of changes: .../sbin/x2gothinclient_create | 1 - .../sbin/x2gothinclient_update | 3 +-- .../sbin/x2gothinclient_upgrade | 6 +++--- 3 files changed, 4 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 39213ba..594770e 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -175,6 +175,5 @@ rm -f $TC_CHROOT/etc/udev/rules.d/*-persistent-*.rules x2gothinclient_update -echo echo "X2go Thin Client creation has finished successfully." echo diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_update b/x2gothinclientmanagement/sbin/x2gothinclient_update index 4f65ffa..9c0d9f7 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_update +++ b/x2gothinclientmanagement/sbin/x2gothinclient_update @@ -67,5 +67,4 @@ cp -v "$TC_CONFIG/x2gothinclient_sessions" "$TC_CHROOT/etc/x2go/x2gothinclient_s 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 a15d851..3728dde 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -65,11 +65,11 @@ chmod +x /sbin/start-stop-daemon [ \$? -eq 0 ] && apt-get upgrade # check for kernel upgrades -for symlink in /vmlinuz /initrd.img; do +for symlink in /vmlinuz /vmlinuz.old /initrd.img /initrd.img.old; 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 + echo $symlink_target | egrep ".*-486$" >/dev/null && mv $symlink \${symlink/.old/}.486 + echo $symlink_target | egrep ".*-686$" >/dev/null && mv $symlink \${symlink/.old/}.686 fi 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).