This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit dd9596522516126fcd2b832e86d2af6aeefd5393 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Tue Feb 6 17:58:07 2018 +0100 install chroot for amd64 --- debian/changelog | 1 + management/sbin/x2gothinclient_create | 17 ++++++++++------- management/sbin/x2gothinclient_preptftpboot | 10 ++++++---- management/share/tftpboot/default.cfg | 6 +++--- management/share/tftpboot/x2go-tce.cfg | 6 +++--- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 29874c5..77846d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -142,6 +142,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low * add pxelinux in recommends for x2gothinclient-management * fix links in x2gothinclient_preptftpboot * fix link in x2gothinclient_create + * install chroot for amd64 [ Martti Pitkänen ] * debian/po: diff --git a/management/sbin/x2gothinclient_create b/management/sbin/x2gothinclient_create index c443d2c..310c20d 100755 --- a/management/sbin/x2gothinclient_create +++ b/management/sbin/x2gothinclient_create @@ -105,7 +105,7 @@ export http_proxy="$TC_HTTP_PROXY" export https_proxy="$TC_HTTPS_PROXY" export ftp_proxy="$TC_FTP_PROXY" -debootstrap --arch i386 "$TC_DISTRO_CODENAME" "$TC_CHROOT/" "$TC_DEBMIRROR_URL" +debootstrap "$TC_DISTRO_CODENAME" "$TC_CHROOT/" "$TC_DEBMIRROR_URL" cp /etc/resolv.conf "$TC_CHROOT/etc/resolv.conf" if [ "$TC_DISTRO_CODENAME" = "squeeze" ]; then @@ -127,7 +127,7 @@ none /media tmpfs size=50M,mode=755 0 0 none /var/lib/nfs tmpfs size=50M,mode=755,uid=statd,gid=nogroup 0 0 none /var/lib/xkb tmpfs size=50M,mode=755 0 0 none /var/lib/dbus tmpfs size=50M,mode=755 0 0 -none /var/lib/alsa tmpfs size=50M,mode=755 0 0 +#none /var/lib/alsa tmpfs size=50M,mode=755 0 0 EOF # differences between Debian versions @@ -198,11 +198,11 @@ export X2GO_HANDLE_DAEMONS=false if [ \$? -eq 0 -a "x${TC_NONINTERACTIVE}" != "x" ]; then dpkg-reconfigure locales fi -[ \$? -eq 0 ] && apt-get install linux-image-4.9.0-4-686 -y -[ \$? -eq 0 ] && test -h /vmlinuz && mv /vmlinuz /vmlinuz.4.9.0-4-686.tmp || true -[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /vmlinuz.4.9.0-4-686.tmp | sed 's@/boot@boot@') && ln -sf \$LINK_TARGET /vmlinuz.4.9.0-4-686 && rm -f /vmlinuz.4.9.0-4-686.tmp -[ \$? -eq 0 ] && test -h /initrd.img && mv /initrd.img /initrd.img.4.9.0-4-686.tmp || true -[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.4.9.0-4-686.tmp | sed 's@/boot@boot@') && ln -sf \$LINK_TARGET /initrd.img.4.9.0-4-686 && rm -f /initrd.img.4.9.0-4-686.tmp +[ \$? -eq 0 ] && apt-get install linux-image-4.9.0-4-amd64 -y +[ \$? -eq 0 ] && test -h /vmlinuz && mv /vmlinuz /vmlinuz.4.9.0-4-amd64.tmp || true +[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /vmlinuz.4.9.0-4-amd64.tmp | sed 's@/boot@boot@') && ln -sf \$LINK_TARGET /vmlinuz.4.9.0-4-amd64 && rm -f /vmlinuz.4.9.0-4-amd64.tmp +[ \$? -eq 0 ] && test -h /initrd.img && mv /initrd.img /initrd.img.4.9.0-4-amd64.tmp || true +[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.4.9.0-4-amd64.tmp | sed 's@/boot@boot@') && ln -sf \$LINK_TARGET /initrd.img.4.9.0-4-amd64 && rm -f /initrd.img.4.9.0-4-amd64.tmp [ \$? -eq 0 ] && apt-get install x2gothinclient-chroot x2gothinclient-${TC_FLAVOUR} -y --force-yes @@ -214,6 +214,9 @@ fi # boot from NFS (only relevant for Debian squeeze) [ \$? -eq 0 ] && sed -e 's/BOOT=local/BOOT=nfs/' -i /etc/initramfs-tools/initramfs.conf +#build initramfs for nfs boot +[ \$? -eq 0 ] && sed -e 's/MODULES=most/MODULES=netboot/' -i /etc/initramfs-tools/initramfs.conf + [ \$? -eq 0 ] && rm -f /etc/udev/rules.d/*-persistent-*.rules [ \$? -eq 0 ] && if ! getent passwd x2gothinclient 1>/dev/null; then adduser --system --disabled-password --disabled-login --shell /bin/bash --group --home /var/lib/x2gothinclient x2gothinclient; fi [ \$? -eq 0 ] && adduser x2gothinclient audio diff --git a/management/sbin/x2gothinclient_preptftpboot b/management/sbin/x2gothinclient_preptftpboot index c950ca4..8b3493a 100755 --- a/management/sbin/x2gothinclient_preptftpboot +++ b/management/sbin/x2gothinclient_preptftpboot @@ -65,15 +65,17 @@ echo echo "Linking files for X2Go's TFTP (syslinux) boot environment..." cd "$TC_TFTP_BOOT" -# 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" +# amd64 kernel image +ln -sfv "$TC_CHROOT/vmlinuz.4.9.0-4-amd64" "$TC_TFTP_BOOT/vmlinuz.amd64" +ln -sfv "$TC_CHROOT/initrd.img.4.9.0-4-amd64" "$TC_TFTP_BOOT/initrd.img.amd64" # memtest86+ ln -sfv "$TC_CHROOT/boot/memtest86+.bin" "$TC_TFTP_BOOT/memtest86+.bin" # syslinux components 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" - +ln -sfv "/usr/lib/syslinux/modules/bios/ldlinux.c32" "$TC_TFTP_BOOT/" +ln -sfv "/usr/lib/syslinux/modules/bios/libcom32.c32" "$TC_TFTP_BOOT/" +ln -sfv "/usr/lib/syslinux/modules/bios/libutil.c32" "$TC_TFTP_BOOT/" cd - > /dev/null echo diff --git a/management/share/tftpboot/default.cfg b/management/share/tftpboot/default.cfg index a6f91b5..62e3f61 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 +# localboot, x2go-tce # (... or any other profile you defined in your customized menu) -ONTIMEOUT localboot -TIMEOUT 100 +ONTIMEOUT x2go-tce +TIMEOUT 10 diff --git a/management/share/tftpboot/x2go-tce.cfg b/management/share/tftpboot/x2go-tce.cfg index 71e8933..365f385 100644 --- a/management/share/tftpboot/x2go-tce.cfg +++ b/management/share/tftpboot/x2go-tce.cfg @@ -1,4 +1,4 @@ -LABEL x2go-tce-686 +LABEL x2go-tce MENU LABEL X2Go ^Thin Client - KERNEL vmlinuz.686 - APPEND initrd=initrd.img.686 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset splash + KERNEL vmlinuz.amd64 + APPEND initrd=initrd.img.amd64 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