From 808f2433722ae24bca3c13f319f3a6fbba93926e Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 31 Jan 2024 12:01:36 +0100 Subject: [PATCH] composefs: Bump composefs max version to 1 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 --- src/libostree/ostree-repo-composefs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libostree/ostree-repo-composefs.c b/src/libostree/ostree-repo-composefs.c index cc5e5fde1f..5be83e0d72 100644 --- a/src/libostree/ostree-repo-composefs.c +++ b/src/libostree/ostree-repo-composefs.c @@ -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");