Merge pull request #3149 from alexlarsson/new-composefs-format

composefs: Bump composefs max version to 1
ostreedev · Jan 31, 2024 · 0b0485c · 0b0485c
2 parents 75941b7 + 808f243
commit 0b0485c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/composefs b/composefs
diff --git a/configure.ac b/configure.ac
@@ -284,6 +284,8 @@ AS_IF([test x$have_gpgme = xyes],
 AM_CONDITIONAL(USE_GPGME, test "x$have_gpgme" = xyes)
 
 dnl composefs won't work at all without this
+AC_CHECK_HEADERS([endian.h sys/endian.h machine/endian.h])
+AC_CHECK_FUNCS([reallocarray])
 AC_MSG_CHECKING([for MOUNT_ATTR_IDMAP])
 AC_COMPILE_IFELSE(
 	[AC_LANG_PROGRAM([

diff --git 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");