keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

postprocess: Fix "compose tree" regression with /etc

Browse Source 
The fact that we didn't notice this is a testament to the state of
testing =(

I think I want to change the container build path to also only
grab /usr and /etc rather than having the paths be different,
but for now - the quick fix.

Pull request: #243
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-03-22 10:33:57 -04:00 committed by Colin Walters (automation)
parent ed7fc02b04
commit 3350c0e062
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libpriv/rpmostree-postprocess.c
View File

@ -855,11 +855,14 @@ create_rootfs_from_yumroot_content (GFile *targetroot,
}
/* We take /usr from the yum content */
g_print ("Moving /usr to target\n");
g_print ("Moving /usr and /etc to target\n");
{
gs_unref_object GFile *usr = g_file_get_child (yumroot, "usr");
gs_unref_object GFile *etc = g_file_get_child (yumroot, "etc");
if (!move_to_dir (usr, targetroot, cancellable, error))
goto out;
if (!move_to_dir (etc, targetroot, cancellable, error))
goto out;
}
if (!rpmostree_rootfs_postprocess_common (target_root_dfd, cancellable, error))