summaryrefslogtreecommitdiff
path: root/src/gpt-auto-generator
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-11-28 13:17:28 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-11-30 17:33:26 +0100
commit074cdb953bd2d9ae09aa04769c86868ef8bd066d (patch)
tree9cb8114316b9a9739010df1b47103a8c6ef751f5 /src/gpt-auto-generator
parent9fe6f5cc1668e97be58847a3596890273a402c8f (diff)
downloadsystemd-074cdb953bd2d9ae09aa04769c86868ef8bd066d.tar.gz
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.
Diffstat (limited to 'src/gpt-auto-generator')
-rw-r--r--src/gpt-auto-generator/gpt-auto-generator.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 1dd98eeb1f..5f27edc9ee 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")) {