|
 |
a98e04 |
From dd194eca7272afa457541abb2d8c25f90c4f478a Mon Sep 17 00:00:00 2001
|
|
|
a98e04 |
From: Colin Walters <walters@verbum.org>
|
|
|
a98e04 |
Date: Mon, 28 Mar 2022 17:46:59 -0400
|
|
|
a98e04 |
Subject: [PATCH 6/6] deploy: Be a bit more verbose about SELinux bits
|
|
|
a98e04 |
|
|
|
a98e04 |
Let's log when we don't find the expected CLI argument which
|
|
|
a98e04 |
will help debug things.
|
|
|
a98e04 |
|
|
|
a98e04 |
(cherry picked from commit c58a4fe661d9d3bf2c515aa5605b1e094c0a62ca)
|
|
|
a98e04 |
---
|
|
|
a98e04 |
src/libostree/ostree-sysroot-deploy.c | 7 +++++--
|
|
|
a98e04 |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
a98e04 |
|
|
|
a98e04 |
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
|
|
|
a98e04 |
index a44721d8..404f336f 100644
|
|
|
a98e04 |
--- a/src/libostree/ostree-sysroot-deploy.c
|
|
|
a98e04 |
+++ b/src/libostree/ostree-sysroot-deploy.c
|
|
|
a98e04 |
@@ -2926,9 +2926,12 @@ sysroot_finalize_selinux_policy (int deployment_dfd, GError **error)
|
|
|
a98e04 |
SEMODULE_HELP_ARGC, &exit_status, &stdout, error))
|
|
|
a98e04 |
return FALSE;
|
|
|
a98e04 |
if (!g_spawn_check_exit_status (exit_status, error))
|
|
|
a98e04 |
- return FALSE;
|
|
|
a98e04 |
+ return glnx_prefix_error (error, "failed to run semodule");
|
|
|
a98e04 |
if (!strstr(stdout, "--rebuild-if-modules-changed"))
|
|
|
a98e04 |
- return TRUE;
|
|
|
a98e04 |
+ {
|
|
|
a98e04 |
+ ot_journal_print (LOG_INFO, "semodule does not have --rebuild-if-modules-changed");
|
|
|
a98e04 |
+ return TRUE;
|
|
|
a98e04 |
+ }
|
|
|
a98e04 |
|
|
|
a98e04 |
static const gchar * const SEMODULE_REBUILD_ARGV[] = {
|
|
|
a98e04 |
"semodule", "-N", "--rebuild-if-modules-changed"
|
|
|
a98e04 |
--
|
|
|
a98e04 |
2.31.1
|
|
|
a98e04 |
|