aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-01-29 16:42:08 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-01-29 16:42:08 +0000
commit3460e76ca35650d0c8ac85a397a1661047a3b109 (patch)
tree592d58b3c4a2e880fbc628185e967aea5c3581bd
parent673ba5611e053e7c44ba232572ea2956aecc7fc1 (diff)
downloadlh-bootstrap-3460e76ca35650d0c8ac85a397a1661047a3b109.tar.xz
Small incremental build fixes (38)
-rw-r--r--sub/skarnet.org/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile
index 547dec0..ce59a61 100644
--- a/sub/skarnet.org/Makefile
+++ b/sub/skarnet.org/Makefile
@@ -332,7 +332,7 @@ $(OUTPUT)/build-host/.lh_s6li_laidout: $(OUTPUT)/build-host/.lh_s6li_installed |
exec mkdir -p $(OUTPUT)/rootfs/etc/s6-linux-init
exec rm -rf $(OUTPUT)/rootfs/etc/s6-linux-init/s6lidir
exec s6-linux-init-maker -u $(NORMALUSER) $(EARLY_GETTY) -1 -p /command:/bin -s /run/kernel_env -f $(OUTPUT)/build-build/etc/s6-linux-init/skel -- $(OUTPUT)/rootfs/etc/s6-linux-init/s6lidir
- exec sed -i 's/ "$(NORMALUSER)" / catchlog /' $(OUTPUT)/rootfs/etc/s6-linux-init/s6lidir/run-image/service/s6-svscan-log/run
+ exec sed -i 's/s6-setuidgid "$(NORMALUSER)"/s6-setuidgid catchlog/' $(OUTPUT)/rootfs/etc/s6-linux-init/s6lidir/run-image/service/s6-svscan-log/run
exec chown 98:98 $(OUTPUT)/rootfs/etc/s6-linux-init/s6lidir/run-image/uncaught-logs
exec chmod 02750 $(OUTPUT)/rootfs/etc/s6-linux-init/s6lidir/run-image/uncaught-logs
exec rm -rf $(OUTPUT)/rootfs/etc/s6-linux-init/current