Skip to content
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

Jump to bottom

cmdlib: don't use cache qcow for composes; use virtiofs #3720

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

cmdlib: don't use cache qcow for composes; use virtiofs #3720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0daf8fa
mantle/platform/qemu: pass --xattr to virtiofsd
dustymabe Feb 6, 2024
100198b
cmdlib: don't use cache qcow for composes; use virtiofs
dustymabe Feb 6, 2024
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
2 changes: 2 additions & 0 deletions mantle/platform/qemu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,6 +1626,8 @@ func createVirtiofsCmd(directory, socketPath string) exec.Cmd {
// We don't need seccomp filtering; we trust our workloads. This incidentally
// works around issues like https://gitlab.com/virtio-fs/virtiofsd/-/merge_requests/200.
args = append(args, "--seccomp=none")
// OSTree composes use xattrs
args = append(args, "--xattr")
cmd := exec.Command("/usr/libexec/virtiofsd", args...)
// This sets things up so that the `.` we passed in the arguments is the target directory
cmd.Dir = directory
Expand Down
4 changes: 2 additions & 2 deletions src/cmdlib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ runcompose_tree() {
(umask 0022 && sudo -E "$@")
sudo chown -R -h "${USER}":"${USER}" "${tmprepo}"
else
runvm_with_cache -- "$@" --repo "${repo}" --write-composejson-to "${composejson}"
runvm -- "$@" --repo "${repo}" --write-composejson-to "${composejson}"
fi
}

Expand All @@ -587,7 +587,7 @@ runcompose_extensions() {
(umask 0022 && sudo -E "$@")
sudo chown -R -h "${USER}":"${USER}" "${outputdir}"
else
runvm_with_cache -- "$@"
runvm -- "$@"
fi
}

Expand Down
Loading