Skip to content

fix(os/mkosi): apply rootfs tmpfiles inside the image as root #1409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kvinwang wants to merge 1 commit into from
+7 −2
Closed

fix(os/mkosi): apply rootfs tmpfiles inside the image as root #1409

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions os/mkosi/mkosi.finalize
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,13 @@ ARTIFACTS="$WORK/artifacts"
source "$SELF/versions.env"

"$SELF/scripts/normalize-skeleton-modes.sh" "$TREE" "$FLAVOR"
# After mkosi's own tmpfiles pass, so these override package defaults.
systemd-tmpfiles --root="$TREE" --create "$SELF/rootfs.tmpfiles"
# After mkosi's own tmpfiles pass, so these override package defaults. Run it
# in the image as root: a rootless build runs this script as the caller, which
# cannot chown to root. mkosi-chroot bind-mounts /etc/resolv.conf, so that link
# is made from outside.
mkosi-chroot systemd-tmpfiles --create --exclude-prefix=/etc/resolv.conf \
"$CHROOT_SRCDIR/dstack/os/mkosi/rootfs.tmpfiles"
ln -sfn /run/systemd/resolve/stub-resolv.conf "$TREE/etc/resolv.conf"
"$SELF/scripts/write-os-release.sh" \
"$TREE" "$DSTACK_VERSION" "$DSTACK_CODENAME"
mkdir -p "$KSTAGE/usr/lib" "$OUTPUTDIR/.image-tools"
Expand Down
Loading