From 57c2a0d3735fa68a8ae807dab6475e1a06d19031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Karpi=C5=84ski?= <hugo@staszic.waw.pl>
Date: Sun, 9 Feb 2020 22:15:59 +0100
Subject: [PATCH] moved http to 8014

---
 linux/Makefile                                              | 2 +-
 linux/src/etc/initramfs-tools/scripts/local-top/download.sh | 2 +-
 tftp/Dockerfile                                             | 1 +
 tftp/http.xinetd.conf                                       | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/linux/Makefile b/linux/Makefile
index c6f6dfc..e39fc07 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -24,7 +24,7 @@ build/rootfs/initrd.img: build/rootfs $(FILES) | build
 	$(CHROOT_CMD) "apt update && apt install -y linux-image-4.19.0-*-amd64"
 	$(CHROOT_CMD) "update-initramfs -c -kall"
 
-$(FILES): build/rootfs | build
+$(FILES): $(FILES_SRC) build/rootfs | build
 	mkdir -p $(@D)
 	cp $(shell echo $@ | sed -e 's|^build/rootfs/|src/|') $@
 
diff --git a/linux/src/etc/initramfs-tools/scripts/local-top/download.sh b/linux/src/etc/initramfs-tools/scripts/local-top/download.sh
index 9a51dd7..205fad4 100644
--- a/linux/src/etc/initramfs-tools/scripts/local-top/download.sh
+++ b/linux/src/etc/initramfs-tools/scripts/local-top/download.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 . /scripts/functions
 configure_networking
-wget http://192.168.14.2/root.squashfs
+wget http://192.168.14.2:8014/root.squashfs
 mkdir /mnt
 modprobe loop
 losetup /dev/loop0
diff --git a/tftp/Dockerfile b/tftp/Dockerfile
index 6f9ad64..d6ce4d4 100644
--- a/tftp/Dockerfile
+++ b/tftp/Dockerfile
@@ -2,4 +2,5 @@ FROM debian:buster
 RUN apt update && apt install -y xinetd tftpd-hpa busybox
 COPY tftp.xinetd.conf /etc/xinetd.d/tftp
 COPY http.xinetd.conf /etc/xinetd.d/http
+RUN echo "http-boot 8014/tcp" >> /etc/services
 CMD ["script", "-c", "/usr/sbin/xinetd -d"]
diff --git a/tftp/http.xinetd.conf b/tftp/http.xinetd.conf
index 8fd7603..92d68ed 100644
--- a/tftp/http.xinetd.conf
+++ b/tftp/http.xinetd.conf
@@ -1,4 +1,4 @@
-service http
+service http-boot
 {
   socket_type = stream
   protocol = tcp
@@ -6,6 +6,6 @@ service http
   user = root
   server = /bin/busybox
   server_args = httpd -if -h /tftpboot
-  port = 80
+  port = 8014
   flags = IPv4
 }