Skip to content

Commit 0697d4e

Browse files
committed
build-sys: Avoid propagating local perms into /usr
The `cp -a lbi/usr/. /usr` command was preserving local directory permissions which in one case for me have a restrictive mode 0750 which breaks booting. Switch to `install -D -m 0644` which explicitly sets file modes and creates parent directories with correct 755 permissions, while also simplifying the directory structure. Assisted-by: OpenCode (Opus 4.5) Signed-off-by: Colin Walters <[email protected]>
1 parent ab78a79 commit 0697d4e

File tree

5 files changed

+1
-1
lines changed

5 files changed

+1
-1
lines changed

hack/lbi/usr/share/containers/systemd/curl-base.image renamed to hack/lbi/curl-base.image

File renamed without changes.

hack/lbi/usr/share/containers/systemd/curl.container renamed to hack/lbi/curl.container

File renamed without changes.

hack/lbi/usr/share/containers/systemd/jboss-webserver-5.image renamed to hack/lbi/jboss-webserver-5.image

File renamed without changes.

hack/lbi/usr/share/containers/systemd/podman.image renamed to hack/lbi/podman.image

File renamed without changes.

hack/provision-derived.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ fi
127127
# for testing bootc install on Fedora CoreOS where these would conflict.
128128
if test -z "${SKIP_CONFIGS:-}"; then
129129
# For test-22-logically-bound-install
130-
cp -a lbi/usr/. /usr
130+
install -D -m 0644 -t /usr/share/containers/systemd/ lbi/*
131131
for x in curl.container curl-base.image podman.image; do
132132
ln -s /usr/share/containers/systemd/$x /usr/lib/bootc/bound-images.d/$x
133133
done

0 commit comments

Comments
 (0)