Skip to content

Commit

Permalink
composefs: Bump composefs max version to 1
Browse files Browse the repository at this point in the history
This generates the new format for whiteout markers which was added in
6.8 (and which will be backported to 6.7). Without this whiteouts
will not work anymore.

This is a slight format change, but will only affect ostree commits
that already were broken (i.e that had whiteouts), and since the
composefs code is still marked experimental I think it is fine to
do this without introducing another format version on the ostree
side.

Signed-off-by: Alexander Larsson <[email protected]>
  • Loading branch information
alexlarsson committed Jan 31, 2024
1 parent 0d9dc2b commit 808f243
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/libostree/ostree-repo-composefs.c
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,9 @@ ostree_composefs_target_write (OstreeComposefsTarget *target, int fd, guchar **o
options.file_write_cb = _composefs_write_cb;
}

options.version = 0;
options.max_version = 1; /* Support new whiteout xattr if required */

if (lcfs_write_to (root, &options) != 0)
return glnx_throw_errno_prefix (error, "lcfs_write_to");

Expand Down

0 comments on commit 808f243

Please sign in to comment.