packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

selinux-ensure-labeled: Support no arguments to just traverse deployment root 

This makes it easy to use for the case where rpm-ostree-toolbox is
injecting systemd services into the deployment root, and we don't
actually need to traverse the whole FS.
This commit is contained in:
Colin Walters 2014-05-22 19:24:39 -04:00
parent a864190a04
commit 19abd8277f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c
View File

@ -179,23 +179,12 @@ ot_admin_instutil_builtin_selinux_ensure_labeled (int argc, char **argv, OstreeS
gboolean ret = FALSE; gboolean ret = FALSE;
const char *policy_name; const char *policy_name;
gs_unref_object GFile *subpath = NULL; gs_unref_object GFile *subpath = NULL;
const char *prefix; const char *prefix = NULL;
gs_unref_object OstreeSePolicy *sepolicy = NULL; gs_unref_object OstreeSePolicy *sepolicy = NULL;
gs_unref_ptrarray GPtrArray *deployments = NULL; gs_unref_ptrarray GPtrArray *deployments = NULL;
OstreeDeployment *first_deployment; OstreeDeployment *first_deployment;
gs_unref_object GFile *deployment_path = NULL; gs_unref_object GFile *deployment_path = NULL;
if (argc < 3)
{
g_printerr ("usage: %s SUBPATH PREFIX\n", argv[0]);
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Option processing failed");
goto out;
}
subpath = g_file_new_for_path (argv[1]);
prefix = argv[2];
if (!ostree_sysroot_load (sysroot, cancellable, error)) if (!ostree_sysroot_load (sysroot, cancellable, error))
goto out; goto out;
@ -209,6 +198,17 @@ ot_admin_instutil_builtin_selinux_ensure_labeled (int argc, char **argv, OstreeS
first_deployment = deployments->pdata[0]; first_deployment = deployments->pdata[0];
deployment_path = ostree_sysroot_get_deployment_directory (sysroot, first_deployment); deployment_path = ostree_sysroot_get_deployment_directory (sysroot, first_deployment);
if (argc >= 2)
{
subpath = g_file_new_for_path (argv[1]);
prefix = argv[2];
}
else
{
subpath = g_object_ref (deployment_path);
prefix = "";
}
sepolicy = ostree_sepolicy_new (deployment_path, cancellable, error); sepolicy = ostree_sepolicy_new (deployment_path, cancellable, error);
if (!sepolicy) if (!sepolicy)
goto out; goto out;