picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-11-28 13:17:28 +01:00
parent 9fe6f5cc16
commit 074cdb953b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gpt-auto-generator/gpt-auto-generator.c
View File

@ -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")) {