From b9b7ae446eaefba5706ef20630fe01951da7fe47 Mon Sep 17 00:00:00 2001 From: Piyush Gupta Date: Thu, 19 Jan 2023 09:46:46 +0000 Subject: [PATCH 4/4] Revert for commit https://github.com/ostreedev/ostree/commit/edb4f3893474736156c654aa43bdbf3784991811 Skip rebuild of selinux policy in new deployment since bwrap complains for "invalid argument" while running in deployment. --- src/libostree/ostree-sysroot-deploy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c index 13387af..1394b50 100644 --- a/src/libostree/ostree-sysroot-deploy.c +++ b/src/libostree/ostree-sysroot-deploy.c @@ -3224,7 +3224,7 @@ get_var_dfd (OstreeSysroot *self, int osdeploy_dfd, OstreeDeployment *deployment return glnx_opendirat (base_dfd, base_path, TRUE, ret_fd, error); } -#ifdef HAVE_SELINUX +#if 0 static void child_setup_fchdir (gpointer data) { @@ -3399,7 +3399,7 @@ sysroot_finalize_deployment (OstreeSysroot *self, OstreeDeployment *deployment, cancellable, error)) return FALSE; -#ifdef HAVE_SELINUX +#if 0 if (!sysroot_finalize_selinux_policy (deployment_dfd, error)) return FALSE; #endif /* HAVE_SELINUX */ -- 2.41.0