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

treecompose: Add various g_prefix_error()

Browse Source 
To help debug a problem which turned out to be in SELinux postprocessing for
RHELAH.

Closes: #830
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-06-15 13:29:06 -04:00 committed by Atomic Bot
parent 4a61e55663
commit 9f671efc60
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/rpmostree-compose-builtin-tree.c
View File

@ -1008,12 +1008,18 @@ rpmostree_compose_builtin_tree (int argc,
if (!rpmostree_treefile_postprocessing (rootfs_fd, self->treefile_context_dirs->pdata[0],
self->serialized_treefile, treefile,
next_version, cancellable, error))
{
g_prefix_error (error, "Postprocessing: ");
goto out;
}
if (!rpmostree_prepare_rootfs_for_commit (self->workdir_dfd, &rootfs_fd, rootfs_name,
treefile,
cancellable, error))
{
g_prefix_error (error, "Preparing rootfs for commit: ");
goto out;
}
if (!rpmostree_copy_additional_files (yumroot, self->treefile_context_dirs->pdata[0], treefile, cancellable, error))
goto out;
@ -1021,12 +1027,18 @@ rpmostree_compose_builtin_tree (int argc,
if (!rpmostree_check_passwd (repo, yumroot, treefile_dirpath, treefile,
previous_checksum,
cancellable, error))
{
g_prefix_error (error, "Handling passwd db: ");
goto out;
}
if (!rpmostree_check_groups (repo, yumroot, treefile_dirpath, treefile,
previous_checksum,
cancellable, error))
{
g_prefix_error (error, "Handling group db: ");
goto out;
}
/* Insert our input hash */
g_hash_table_replace (metadata_hash, g_strdup ("rpmostree.inputhash"),

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

@ -654,10 +654,7 @@ postprocess_selinux_policy_store_location (int rootfs_dfd,
name = dent->d_name;
if (renameat (dfd_iter.fd, name, etc_selinux_dfd, name) != 0)
{
glnx_set_error_from_errno (error);
return FALSE;
}
return glnx_throw_errno_prefix (error, "rename(%s)", name);
}
return TRUE;
@ -794,13 +791,19 @@ create_rootfs_from_yumroot_content (int target_root_dfd,
/* NSS configuration to look at the new files */
if (!replace_nsswitch (src_rootfs_fd, cancellable, error))
{
g_prefix_error (error, "nsswitch replacement: ");
goto out;
}
if (selinux)
{
if (!postprocess_selinux_policy_store_location (src_rootfs_fd, cancellable, error))
{
g_prefix_error (error, "SELinux postprocess: ");
goto out;
}
}
/* We take /usr from the yum content */
g_print ("Moving /usr and /etc to target\n");
@ -1615,17 +1618,15 @@ rpmostree_prepare_rootfs_for_commit (int workdir_dfd,
glnx_fd_close int target_root_dfd = -1;
if (mkdirat (workdir_dfd, temp_new_root, 0755) < 0)
{
glnx_set_error_from_errno (error);
return FALSE;
}
return glnx_throw_errno_prefix (error, "creating %s", temp_new_root);
if (!glnx_opendirat (workdir_dfd, temp_new_root, TRUE,
&target_root_dfd, error))
return FALSE;
if (!create_rootfs_from_yumroot_content (target_root_dfd, *inout_rootfs_fd, treefile,
cancellable, error))
return FALSE;
return glnx_prefix_error (error, "Finalizing rootfs");
(void) close (*inout_rootfs_fd);
@ -1634,10 +1635,7 @@ rpmostree_prepare_rootfs_for_commit (int workdir_dfd,
if (TEMP_FAILURE_RETRY (renameat (workdir_dfd, temp_new_root,
workdir_dfd, rootfs_name)) != 0)
{
glnx_set_error_from_errno (error);
return FALSE;
}
return glnx_throw_errno_prefix (error, "rename(%s, %s)", temp_new_root, rootfs_name);
*inout_rootfs_fd = target_root_dfd;
target_root_dfd = -1; /* Transfer ownership */