From: Colin Walters <walters@verbum.org>
Date: Mon, 28 Mar 2022 21:46:59 +0000 (-0400)
Subject: deploy: Be a bit more verbose about SELinux bits
X-Git-Tag: archive/raspbian/2022.4-1+rpi1^2~9^2~1^2~9^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c58a4fe661d9d3bf2c515aa5605b1e094c0a62ca;p=ostree.git

deploy: Be a bit more verbose about SELinux bits

Let's log when we don't find the expected CLI argument which
will help debug things.
---

diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index 3f301891..5219e2a4 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -2926,9 +2926,12 @@ sysroot_finalize_selinux_policy (int deployment_dfd, GError **error)
                           SEMODULE_HELP_ARGC, &exit_status, &stdout, error))
     return FALSE;
   if (!g_spawn_check_exit_status (exit_status, error))
-    return FALSE;
+    return glnx_prefix_error (error, "failed to run semodule");
   if (!strstr(stdout, "--rebuild-if-modules-changed"))
-    return TRUE;
+    {
+      ot_journal_print (LOG_INFO, "semodule does not have --rebuild-if-modules-changed");
+      return TRUE;
+    }
 
   static const gchar * const SEMODULE_REBUILD_ARGV[] = {
     "semodule", "-N", "--rebuild-if-modules-changed"