From: Justin Trudell <justin.trudell.4@gmail.com>
Date: Fri, 1 Nov 2019 19:00:16 +0000 (-0700)
Subject: nspawn: respect quiet on capabilities warning
X-Git-Tag: v244-rc1~107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ccdaa79ca69a40e4ad8b3e63b1236734751452e;p=thirdparty%2Fsystemd.git

nspawn: respect quiet on capabilities warning
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 070a10fbebb..3513c015b82 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2390,7 +2390,8 @@ static int drop_capabilities(uid_t uid) {
                 /* If we're not using OCI, proceed with mangled capabilities (so we don't error out)
                  * in order to maintain the same behavior as systemd < 242. */
                 if (capability_quintet_mangle(&q))
-                        log_warning("Some capabilities will not be set because they are not in the current bounding set.");
+                        log_full(arg_quiet ? LOG_DEBUG : LOG_WARNING,
+                                 "Some capabilities will not be set because they are not in the current bounding set.");
 
         }