compose: Add treefile as arg to postprocess

Prep for sysusers.
coreos · Mar 16, 2019 · c8f81b4 · c8f81b4
1 parent d919a13
commit c8f81b4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/app/rpmostree-compose-builtin-rojig.c b/src/app/rpmostree-compose-builtin-rojig.c
@@ -520,7 +520,7 @@ impl_write_rojig (RpmOstreeRojigCompose *self,
     return FALSE;
   if (!rpmostree_rootfs_postprocess_common (self->rootfs_dfd, cancellable, error))
     return FALSE;
-  if (!rpmostree_postprocess_final (self->rootfs_dfd, self->treefile, TRUE,
+  if (!rpmostree_postprocess_final (self->rootfs_dfd, self->treefile_rs, self->treefile, TRUE,
                                     cancellable, error))
     return FALSE;
 

diff --git a/src/app/rpmostree-compose-builtin-tree.c b/src/app/rpmostree-compose-builtin-tree.c
@@ -966,7 +966,8 @@ impl_commit_tree (RpmOstreeTreeComposeContext *self,
     return FALSE;
   if (!rpmostree_rootfs_postprocess_common (self->rootfs_dfd, cancellable, error))
     return FALSE;
-  if (!rpmostree_postprocess_final (self->rootfs_dfd, self->treefile, self->unified_core_and_fuse,
+  if (!rpmostree_postprocess_final (self->rootfs_dfd, self->treefile_rs,
+                                    self->treefile, self->unified_core_and_fuse,
                                     cancellable, error))
     return FALSE;
 
@@ -1184,7 +1185,7 @@ rpmostree_compose_builtin_postprocess (int             argc,
     return FALSE;
   if (!rpmostree_rootfs_postprocess_common (rootfs_dfd, cancellable, error))
     return FALSE;
-  if (!rpmostree_postprocess_final (rootfs_dfd, treefile, opt_unified_core,
+  if (!rpmostree_postprocess_final (rootfs_dfd, treefile_rs, treefile, opt_unified_core,
                                     cancellable, error))
     return FALSE;
   return TRUE;

diff --git a/src/libpriv/rpmostree-postprocess.c b/src/libpriv/rpmostree-postprocess.c
@@ -967,6 +967,7 @@ postprocess_selinux_policy_store_location (int rootfs_dfd,
  */
 gboolean
 rpmostree_postprocess_final (int            rootfs_dfd,
+                             RORTreefile   *treefile_rs,
                              JsonObject    *treefile,
                              gboolean       unified_core_mode,
                              GCancellable  *cancellable,

diff --git a/src/libpriv/rpmostree-postprocess.h b/src/libpriv/rpmostree-postprocess.h
@@ -86,6 +86,7 @@ rpmostree_prepare_rootfs_for_commit (int            src_rootfs_dfd,
 
 gboolean
 rpmostree_postprocess_final (int            rootfs_dfd,
+                             RORTreefile   *treefile_rs,
                              JsonObject    *treefile,
                              gboolean       unified_core_mode,
                              GCancellable  *cancellable,