From 3236f269d5b2f19a1915cebbcd224195cef4b12f Mon Sep 17 00:00:00 2001
From: "Lance R. Vick" <lance@lrvick.net>
Date: Tue, 16 Jan 2024 09:47:15 -0800
Subject: [PATCH] live-bootstrap -> bootstrap

---
 src/bootstrap/{live-bootstrap => bootstrap}/Dockerfile | 7 ++++---
 src/bootstrap/build.mk                                 | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)
 rename src/bootstrap/{live-bootstrap => bootstrap}/Dockerfile (92%)

diff --git a/src/bootstrap/live-bootstrap/Dockerfile b/src/bootstrap/bootstrap/Dockerfile
similarity index 92%
rename from src/bootstrap/live-bootstrap/Dockerfile
rename to src/bootstrap/bootstrap/Dockerfile
index 26eb3da..780b502 100644
--- a/src/bootstrap/live-bootstrap/Dockerfile
+++ b/src/bootstrap/bootstrap/Dockerfile
@@ -21,8 +21,9 @@ RUN set -eux; \
 WORKDIR live-bootstrap
 RUN ./download-distfiles.sh
 RUN set -eux; \
-    mkdir -p /rootfs; \
-    mv steps distfiles seed/* /rootfs/
+    mkdir -p /rootfs/external; \
+    mv steps seed/* /rootfs/; \
+    mv distfiles /rootfs/external/
 RUN echo "\
 FORCE_TIMESTAMPS=False\n\
 CHROOT=True\n\
@@ -38,7 +39,7 @@ DISK=sda1\n\
 KERNEL_BOOTSTRAP=False\n\
 BUILD_KERNELS=False\
 " > /rootfs/steps/bootstrap.cfg
-RUN cat /rootfs/steps/bootstrap.cfg
+RUN touch /rootfs/steps/lwext4-1.0.0-lb1/files/fiwix-file-list.txt
 
 FROM scratch as build
 COPY --from=stage0 / .
diff --git a/src/bootstrap/build.mk b/src/bootstrap/build.mk
index 535c43c..78ff1fb 100644
--- a/src/bootstrap/build.mk
+++ b/src/bootstrap/build.mk
@@ -1,10 +1,10 @@
 .PHONY: bootstrap
 bootstrap: \
-	out/live-bootstrap.tgz \
+	out/bootstrap.tgz \
 	out/stage0.tgz
 
-out/live-bootstrap.tgz: out/stage0.tgz
-	$(call build,bootstrap,live-bootstrap)
+out/bootstrap.tgz: out/stage0.tgz
+	$(call build,bootstrap,bootstrap)
 
 out/stage0.tgz:
 	$(call build,bootstrap,stage0)