summaryrefslogtreecommitdiff
path: root/sub/layout/copylayout
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 /sub/layout/copylayout
parentdd6128ee0536fe3e47965220ef07a124121b3a63 (diff)
downloadlh-bootstrap-82080e56145c1e7374278a69b0517664071e9e2d.tar.xz
Fix 4/n
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'sub/layout/copylayout')
-rwxr-xr-xsub/layout/copylayout8
1 files changed, 4 insertions, 4 deletions
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"