aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-10-31 18:21:37 +0000
committerLaurent Bercot <ska@appnovation.com>2023-10-31 18:21:37 +0000
commit82080e56145c1e7374278a69b0517664071e9e2d (patch)
tree8eb7a33a8a37a5d54418fc655a106e0c7ca7e021 /Makefile
parentdd6128ee0536fe3e47965220ef07a124121b3a63 (diff)
downloadlh-bootstrap-82080e56145c1e7374278a69b0517664071e9e2d.tar.gz
Fix 4/n
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7a24439..c8da364 100644
--- a/Makefile
+++ b/Makefile
@@ -83,9 +83,12 @@ $(OUTPUT)/tmp/.lh_userfs_installed: $(OUTPUT)/tmp/.lh_layout_installed
# The qemu disk images (requires qemu)
$(OUTPUT)/tmp/.lh_diskimages_done: $(OUTPUT)/build-$(TRIPLE)/kernel/.lh_modules_installed $(OUTPUT)/tmp/.lh_rootfs_installed $(OUTPUT)/tmp/.lh_rwfs_installed $(OUTPUT)/tmp/.lh_userfs_installed | $(OUTPUT)/build-build/.lh_done
- setuidgid $(NORMALUSER) makeqcow2 $(OUTPUT)/rootfs $(ROOTFS_SIZE) & \
- setuidgid $(NORMALUSER) makeqcow2 $(OUTPUT)/rwfs $(RWFS_SIZE) & \
- setuidgid $(NORMALUSER) makeqcow2 $(OUTPUT)/userfs $(USERFS_SIZE) & wait
+ makeqcow2 $(OUTPUT)/rootfs $(ROOTFS_SIZE) & \
+ makeqcow2 $(OUTPUT)/rwfs $(RWFS_SIZE) & \
+ makeqcow2 $(OUTPUT)/userfs $(USERFS_SIZE) & wait
+ exec s6-envuidgid $(NORMALUSER) s6-chown -U $(OUTPUT)/rootfs.qcow2
+ exec s6-envuidgid $(NORMALUSER) s6-chown -U $(OUTPUT)/rwfs.qcow2
+ exec s6-envuidgid $(NORMALUSER) s6-chown -U $(OUTPUT)/userfs.qcow2
exec setuidgid $(NORMALUSER) touch $@
qemu-boot: