summaryrefslogtreecommitdiff
path: root/sub/layout
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-01-03 18:01:11 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-01-03 18:01:11 +0000
commitd7e8c75b56a90940bb4bdb18de72f641ade0a042 (patch)
tree23fd6ffe06f3e7941e345c69771b1eef95854560 /sub/layout
parenta57659465b7eadbfec6d5bb09de6f60903035bf2 (diff)
downloadlh-bootstrap-d7e8c75b56a90940bb4bdb18de72f641ade0a042.tar.xz
Modernize, convert to s6li v1
Diffstat (limited to 'sub/layout')
-rwxr-xr-xsub/layout/copylayout5
-rw-r--r--sub/layout/permissions4
2 files changed, 2 insertions, 7 deletions
diff --git a/sub/layout/copylayout b/sub/layout/copylayout
index 32b991d..e0ea0a2 100755
--- a/sub/layout/copylayout
+++ b/sub/layout/copylayout
@@ -8,10 +8,7 @@ find "$output/rootfs" -type f -name .empty -size 0c -exec s6-rmrf {} \;
buildtime=$(s6-clock)
hostarch=$(s6-echo $TRIPLE | cut -f1 -d-)
-sed -i -e "s/%%HOSTNAME%%/lh-$hostarch/g" $output/rootfs/run/service/s6-linux-init-early-getty/run $output/rootfs/etc/motd $output/rootfs/etc/issue.net $output/rootfs/root/.execline-shell
-sed -i -e "s/%%CONSOLE%%/$console/g" $output/rootfs/run/service/s6-linux-init-early-getty/run
-
-s6-mkfifo -m 0600 $output/rootfs/run/service/s6-svscan-log/fifo
+sed -i -e "s/%%HOSTNAME%%/lh-$hostarch/g" $output/rootfs/etc/motd $output/rootfs/etc/issue.net $output/rootfs/root/.execline-shell
while read file user group perms ; do
if s6-test -n "$file" -a "$file" != "#" ; then
diff --git a/sub/layout/permissions b/sub/layout/permissions
index d940583..76f737e 100644
--- a/sub/layout/permissions
+++ b/sub/layout/permissions
@@ -1,6 +1,4 @@
-rootfs/etc/shadow 0 0 0600
-rootfs/run/uncaught-logs 98 98 2700
-
+rootfs/etc/shadow 0 0 0600
rootfs/tmp 0 0 1777
rootfs/var/log/klogd 102 61 2700
rootfs/var/log/ntpclient 106 62 2700