shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-11 20:58:45 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
composefs: Bump composefs max version to 1
This commit is contained in:
Colin Walters 2024-01-31 08:27:19 -05:00 committed by GitHub
commit 0b0485c7cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composefs

@ -1 +1 @@
Subproject commit cca8be49843385ce556fccf51f75821f70fb7769
Subproject commit 2d5cdcb9176cfe4ccf1761ef6d78e1c48de35649

2
configure.ac
View File

@ -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([

3
src/libostree/ostree-repo-composefs.c
View File

@ -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");