passwd: Use check-* file json config. entries to migrate data across …

…commits
coreos · Jan 21, 2015 · 0745f48 · 0745f48
1 parent 28fb760
commit 0745f48
Show file tree

Hide file tree

Showing 3 changed files with 233 additions and 85 deletions.
diff --git a/src/rpmostree-compose-builtin-tree.c b/src/rpmostree-compose-builtin-tree.c
@@ -1022,7 +1022,7 @@ rpmostree_compose_builtin_tree (int             argc,
     self->serialized_treefile = g_bytes_new_take (treefile_buf, len);
   }
 
-  if (previous_root != NULL)
+  if (TRUE)
     {
       gboolean generate_from_previous = TRUE;
 
@@ -1034,7 +1034,8 @@ rpmostree_compose_builtin_tree (int             argc,
 
       if (generate_from_previous)
         {
-          if (!rpmostree_generate_passwd_from_previous (repo, yumroot, previous_root,
+          if (!rpmostree_generate_passwd_from_previous (repo, yumroot,
+                                                        previous_root, treefile,
                                                         cancellable, error))
             goto out;
         }