From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 28 Nov 2019 12:17:28 +0000 (+0100)
Subject: gpt-auto-generator: improve debug messages a bit
X-Git-Tag: v245-rc1~262^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=074cdb953bd2d9ae09aa04769c86868ef8bd066d;p=thirdparty%2Fsystemd.git

gpt-auto-generator: improve debug messages a bit

In particular, let's give a hint when we do nothing in the common case of
root= being used.
---

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 1dd98eeb1f0..5f27edc9ee1 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -225,7 +225,7 @@ static int add_mount(
         assert(where);
         assert(description);
 
-        log_debug("Adding %s: %s %s", where, what, strna(fstype));
+        log_debug("Adding %s: %s fstype=%s", where, what, fstype ?: "(any)");
 
         if (streq_ptr(fstype, "crypto_LUKS")) {
 
@@ -765,7 +765,10 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
                 /* Disable root disk logic if there's a root= value
                  * specified (unless it happens to be "gpt-auto") */
 
-                arg_root_enabled = streq(value, "gpt-auto");
+                if (!streq(value, "gpt-auto")) {
+                        arg_root_enabled = false;
+                        log_debug("Disabling root partition auto-detection, root= is defined.");
+                }
 
         } else if (proc_cmdline_key_streq(key, "roothash")) {