This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit dde8632974e380f198cbcc08a5ef9639f182fda2 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Tue Feb 6 12:34:40 2018 +0100 fix links in x2gothinclient_preptftpboot --- debian/changelog | 1 + management/sbin/x2gothinclient_preptftpboot | 10 +++++----- management/share/tftpboot/default.cfg | 2 +- management/share/tftpboot/x2go-tce.cfg | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9c73262..aa30002 100644 --- a/debian/changelog +++ b/debian/changelog @@ -140,6 +140,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low * set oldsatble to jessie in x2gothinclient_settings. * install linux-image-4.9.0-4-686 instead of dummy-package * add pxelinux in recommends for x2gothinclient-management + * fix links in x2gothinclient_preptftpboot [ Martti Pitkänen ] * debian/po: diff --git a/management/sbin/x2gothinclient_preptftpboot b/management/sbin/x2gothinclient_preptftpboot index 0a67182..c950ca4 100755 --- a/management/sbin/x2gothinclient_preptftpboot +++ b/management/sbin/x2gothinclient_preptftpboot @@ -65,14 +65,14 @@ echo echo "Linking files for X2Go's TFTP (syslinux) boot environment..." cd "$TC_TFTP_BOOT" -# 486 kernel image -ln -sfv "$TC_CHROOT/vmlinuz.486" "$TC_TFTP_BOOT/vmlinuz.486" -ln -sfv "$TC_CHROOT/initrd.img.486" "$TC_TFTP_BOOT/initrd.img.486" +# 686 kernel image +ln -sfv "$TC_CHROOT/vmlinuz.4.9.0-4-686" "$TC_TFTP_BOOT/vmlinuz.686" +ln -sfv "$TC_CHROOT/initrd.img.4.9.0-4-686" "$TC_TFTP_BOOT/initrd.img.686" # memtest86+ ln -sfv "$TC_CHROOT/boot/memtest86+.bin" "$TC_TFTP_BOOT/memtest86+.bin" # syslinux components -ln -sfv "/usr/lib/syslinux/pxelinux.0" "$TC_TFTP_BOOT/pxelinux.0" -ln -sfv "/usr/lib/syslinux/vesamenu.c32" "$TC_TFTP_BOOT/vesamenu.c32" +ln -sfv "/usr/lib/PXELINUX/pxelinux.0" "$TC_TFTP_BOOT/pxelinux.0" +ln -sfv "/usr/lib/syslinux/modules/bios/vesamenu.c32" "$TC_TFTP_BOOT/vesamenu.c32" cd - > /dev/null diff --git a/management/share/tftpboot/default.cfg b/management/share/tftpboot/default.cfg index 49a25de..a6f91b5 100644 --- a/management/share/tftpboot/default.cfg +++ b/management/share/tftpboot/default.cfg @@ -40,7 +40,7 @@ MENU COLOR cmdmark 1;36;47 #e0ff0000 #00000000 std MENU COLOR cmdline 30;47 #ff000000 #00000000 none # possible boot profiles for ONTIMEOUT: -# localboot, x2go-tce-686, x2go-tce-486 +# localboot, x2go-tce-686 # (... or any other profile you defined in your customized menu) ONTIMEOUT localboot TIMEOUT 100 diff --git a/management/share/tftpboot/x2go-tce.cfg b/management/share/tftpboot/x2go-tce.cfg index c1f0b3a..71e8933 100644 --- a/management/share/tftpboot/x2go-tce.cfg +++ b/management/share/tftpboot/x2go-tce.cfg @@ -1,4 +1,4 @@ -LABEL x2go-tce-486 +LABEL x2go-tce-686 MENU LABEL X2Go ^Thin Client - KERNEL vmlinuz.486 - APPEND initrd=initrd.img.486 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset splash + KERNEL vmlinuz.686 + APPEND initrd=initrd.img.686 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset splash -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git