Skip to content

Commit 0b80830

Browse files
committed
fix(os): exclude host ACLs from rootfs
1 parent 48fab85 commit 0b80830

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

os/mkosi/scripts/make-release-artifacts.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ rootfs="$OUT/files/rootfs.squashfs.verity"
2222
# mksquashfs -noappend overwrites its filesystem but does not reliably remove
2323
# a longer dm-verity tail left by a previous invocation.
2424
truncate -s 0 "$rootfs"
25+
# Privileged mkosi runs can inherit host default ACLs from their workspace.
26+
# The guest rootfs does not rely on xattrs, so exclude this host-only metadata.
2527
env -u SOURCE_DATE_EPOCH mksquashfs "$TREE" "$rootfs" -noappend -all-root -no-progress \
26-
-comp zstd -mkfs-time "$SOURCE_DATE_EPOCH" -all-time "$SOURCE_DATE_EPOCH" >/dev/null
28+
-no-xattrs -comp zstd -mkfs-time "$SOURCE_DATE_EPOCH" \
29+
-all-time "$SOURCE_DATE_EPOCH" >/dev/null
2730
data_size=$(stat -c %s "$rootfs")
2831
data_size=$(( (data_size + 4095) / 4096 * 4096 ))
2932
truncate -s "$data_size" "$rootfs"

0 commit comments

Comments
 (0)