From e65c54ea37a7e793fa034d698f07051261412747 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Mon, 23 Oct 2023 14:53:56 +0200 Subject: [PATCH] fickit: Fix tftpd usage --- Dockerfile-deploy | 3 ++- configs/deploy-supervisord.conf | 2 +- configs/pxelinux.cfg | 16 ++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Dockerfile-deploy b/Dockerfile-deploy index 18c962ba..3a7a7878 100644 --- a/Dockerfile-deploy +++ b/Dockerfile-deploy @@ -15,7 +15,8 @@ RUN apk add --no-cache \ syslinux \ tftp-hpa -RUN touch /var/lib/udhcpd/udhcpd.leases +RUN touch /var/lib/udhcpd/udhcpd.leases && \ + ln -s /srv /usr/share/syslinux/s COPY configs/deploy-initial-config.sh /usr/sbin/initial-config.sh COPY configs/deploy-supervisord.conf /etc/supervisord.conf diff --git a/configs/deploy-supervisord.conf b/configs/deploy-supervisord.conf index 41f2070e..ca374284 100644 --- a/configs/deploy-supervisord.conf +++ b/configs/deploy-supervisord.conf @@ -10,7 +10,7 @@ stderr_logfile = /dev/stderr stderr_logfile_maxbytes = 0 [program:tftpd] -command = /usr/sbin/in.tftpd -R 4096:32767 -v -s /usr/share/syslinux/ +command = /usr/sbin/in.tftpd -a 0.0.0.0:69 -v -s /usr/share/syslinux/ stdout_logfile = /dev/stdout stdout_logfile_maxbytes = 0 stderr_logfile = /dev/stderr diff --git a/configs/pxelinux.cfg b/configs/pxelinux.cfg index 5bcd0616..70441638 100644 --- a/configs/pxelinux.cfg +++ b/configs/pxelinux.cfg @@ -11,23 +11,23 @@ MENU TITLE FICKIT PXE BOOT LABEL backend MENU LABEL Prepare for ^backend - LINUX /fickit-boot-kernel - INITRD /fickit-prepare-initrd.img + LINUX /s/fickit-boot-kernel + INITRD /s/fickit-prepare-initrd.img APPEND console=tty0 fickit.autoprepare=backend LABEL frontend MENU LABEL Prepare for ^frontend - LINUX /fickit-boot-kernel - INITRD /fickit-boot-initrd.img + LINUX /s/fickit-boot-kernel + INITRD /s/fickit-boot-initrd.img APPEND console=tty0 fickit.autoprepare=frontend LABEL prepare MENU LABEL Prepare with ^shell - LINUX /fickit-boot-kernel - INITRD /fickit-boot-initrd.img + LINUX /s/fickit-boot-kernel + INITRD /s/fickit-boot-initrd.img APPEND console=tty0 LABEL update MENU LABEL ^Update images - LINUX /fickit-boot-kernel - INITRD /fickit-update-initrd.img + LINUX /s/fickit-boot-kernel + INITRD /s/fickit-update-initrd.img APPEND console=ttyS0 console=tty0 MENU SEPARATOR LABEL poweroff