aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-01-28 22:17:57 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2021-01-28 22:17:57 +0000
commit7da34f1e5b666871f407d8e1083aef5d04a2e58b (patch)
tree14a2d899e8d9269c47ada3ef750964420d16a460
parent57f94062fa58c6d4674b105161f449c1519314b7 (diff)
downloadlh-bootstrap-7da34f1e5b666871f407d8e1083aef5d04a2e58b.tar.gz
Why, really?
-rw-r--r--sub/skarnet.org/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile
index c6c53cc..1d23c79 100644
--- a/sub/skarnet.org/Makefile
+++ b/sub/skarnet.org/Makefile
@@ -360,8 +360,9 @@ $(OUTPUT)/build-host/.lh_s6li_laidout: $(OUTPUT)/build-host/.lh_s6li_installed |
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 rm -rf $(OUTPUT)/rootfs/etc/s6-linux-init/current
exec mv -f $(OUTPUT)/rootfs/etc/s6-linux-init/s6lidir $(OUTPUT)/rootfs/etc/s6-linux-init/current
- exec chown 98:98 $(OUTPUT)/rootfs/etc/s6-linux-init/current/run-image/uncaught-logs $(OUTPUT)/rootfs/etc/s6-linux-init/current/run-image/service/s6-svscan-log/fifo
- exec chmod 02750 $(OUTPUT)/rootfs/etc/s6-linux-init/current/run-image/uncaught-logs
+ exec $(OUTPUT)/build-build/command/s6-chown -u 98 -g 98 -- $(OUTPUT)/rootfs/etc/s6-linux-init/current/run-image/uncaught-logs
+ exec $(OUTPUT)/build-build/command/s6-chown -u 98 -g 98 -- $(OUTPUT)/rootfs/etc/s6-linux-init/current/run-image/service/s6-svscan-log/fifo
+ exec $(OUTPUT)/build-build/command/s6-chmod 02750 $(OUTPUT)/rootfs/etc/s6-linux-init/current/run-image/uncaught-logs
for i in `ls -1 $(OUTPUT)/rootfs/etc/s6-linux-init/current/bin` ; do ln -sf ../etc/s6-linux-init/current/bin/$$i $(OUTPUT)/rootfs/bin/$$i ; done
exec setuidgid $(NORMALUSER) s6-touch $@