diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2023-10-31 18:21:37 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2023-10-31 18:21:37 +0000 |
| commit | 82080e56145c1e7374278a69b0517664071e9e2d (patch) | |
| tree | 8eb7a33a8a37a5d54418fc655a106e0c7ca7e021 | |
| parent | dd6128ee0536fe3e47965220ef07a124121b3a63 (diff) | |
| download | lh-bootstrap-82080e56145c1e7374278a69b0517664071e9e2d.tar.xz | |
Fix 4/n
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rw-r--r-- | Makefile | 9 | ||||
| -rwxr-xr-x | layout/rootfs/etc/s6-rc/source-base/sshd-4/run | 4 | ||||
| -rwxr-xr-x | sub/layout/copylayout | 8 |
3 files changed, 12 insertions, 9 deletions
@@ -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: diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4/run b/layout/rootfs/etc/s6-rc/source-base/sshd-4/run index 1b5f9a0..324b73e 100755 --- a/layout/rootfs/etc/s6-rc/source-base/sshd-4/run +++ b/layout/rootfs/etc/s6-rc/source-base/sshd-4/run @@ -1,6 +1,6 @@ #!/command/execlineb -S1 fdmove -c 2 1 fdmove 1 3 -s6-tcpserver4 -v 2 -1 -- 10.0.2.1 22 -s6-tcpserver-access -v 2 -RHl0 -t 5000 -i data/rules -- +s6-tcpserver -v 2 -1 -- 10.0.2.1 22 +s6-tcpserver-access -v 2 -Hl0 -t 5000 -i data/rules -- dropbear -i -K 60 diff --git a/sub/layout/copylayout b/sub/layout/copylayout index 3275ba7..aebda10 100755 --- a/sub/layout/copylayout +++ b/sub/layout/copylayout @@ -16,9 +16,9 @@ hostarch=$(s6-echo -- $TRIPLE | cut -f1 -d-) sed -i -e "s/%%HOSTNAME%%/lh-$hostarch/g" $output/rootfs/etc/motd $output/rootfs/etc/issue.net $output/rootfs/root/.execline-shell $output/userfs/home/guest/.execline-shell $output/rootfs/etc/s6-rc/source-base/00/up while read file user group perms ; do - if s6-test -n "$file" -a "$file" != "#" ; then - $output/build-build/command/s6-chown -u $user -g $group -- $output/$file - $output/build-build/command/s6-chmod $perms $output/$file + if eltest -n "$file" -a "$file" != "#" ; then + s6-chown -u $user -g $group -- $output/$file + s6-chmod $perms $output/$file fi done < sub/layout/permissions @@ -26,7 +26,7 @@ done < sub/layout/permissions if ${LIBC_COPY} ; then for lib in lib lib32 lib64 ; do - if s6-test -d "$LIBC_SYSROOT/$lib" ; then + if eltest -d "$LIBC_SYSROOT/$lib" ; then s6-mkdir -p "$output/rootfs/$lib" for i in `ls -1 "$LIBC_SYSROOT/$lib" | grep -e '\.so$' -e '\.so\.'` ; do s6-hiercopy "$LIBC_SYSROOT/$lib/$i" "$output/rootfs/$lib/$i" |