packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2689 from jlebon/pr/ficlone-direct-payload 

lib/commit: Directly use FICLONE for payload link
This commit is contained in:
Colin Walters 2022-08-15 18:33:55 -04:00 committed by GitHub
parent 4471c252a9 84670a0070
commit 9995f370d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libostree/ostree-repo-commit.c
View File

@ -881,11 +881,8 @@ _try_clone_from_payload_link (OstreeRepo *self,
else else
{ {
/* This undoes all of the previous writes; we want to generate reflinked data. */ /* This undoes all of the previous writes; we want to generate reflinked data. */
if (ftruncate (tmpf->fd, 0) < 0) if (ioctl (tmpf->fd, FICLONE, fdf) < 0)
return glnx_throw_errno_prefix (error, "ftruncate"); return glnx_throw_errno_prefix (error, "FICLONE");
if (glnx_regfile_copy_bytes (fdf, tmpf->fd, -1) < 0)
return glnx_throw_errno_prefix (error, "regfile copy");
return TRUE; return TRUE;
} }

3
tests/kolainst/destructive/staged-deploy.sh
View File

@ -100,8 +100,7 @@ EOF
newcommit=$(ostree rev-parse staged-deploy) newcommit=$(ostree rev-parse staged-deploy)
ostree admin upgrade --stage >out.txt ostree admin upgrade --stage >out.txt
test -f /run/ostree/staged-deployment test -f /run/ostree/staged-deployment
# Debating bouncing back out to Ansible for this firstdeploycommit=$(rpm-ostree status --json | jq -r .deployments[0].checksum)
firstdeploycommit=$(rpm-ostree status |grep 'Commit:' |head -1|sed -e 's,^ *Commit: *,,')
assert_streq "${firstdeploycommit}" "${newcommit}" assert_streq "${firstdeploycommit}" "${newcommit}"
# Cleanup # Cleanup
rpm-ostree cleanup -rp rpm-ostree cleanup -rp