]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
bootctl: Fix debug messages
authorSamanta Navarro <ferivoz@riseup.net>
Thu, 16 Feb 2023 11:59:05 +0000 (11:59 +0000)
committerLuca Boccassi <luca.boccassi@gmail.com>
Thu, 16 Feb 2023 16:37:02 +0000 (16:37 +0000)
Remove duplicate KERNEL_INSTALL_MACHINE_ID from message and also
specify the correct origin of layout variable.

Signed-off-by: Samanta Navarro <ferivoz@riseup.net>
src/boot/bootctl-install.c

index c795e75bc3dae51a62bf8ee9ab062770484c23ae..ebb0d486c922779d21956d2544608e7147e53133 100644 (file)
@@ -67,7 +67,7 @@ static int load_etc_machine_info(void) {
                 if (r < 0)
                         return log_error_errno(r, "Failed to parse KERNEL_INSTALL_MACHINE_ID=%s in /etc/machine-info: %m", s);
 
-                log_debug("Loaded KERNEL_INSTALL_MACHINE_ID=%s from KERNEL_INSTALL_MACHINE_ID in /etc/machine-info.",
+                log_debug("Loaded KERNEL_INSTALL_MACHINE_ID=%s from /etc/machine-info.",
                           SD_ID128_TO_STRING(arg_machine_id));
         }
 
@@ -98,7 +98,7 @@ static int load_etc_kernel_install_conf(void) {
                 return log_error_errno(r, "Failed to parse %s: %m", p);
 
         if (!isempty(layout)) {
-                log_debug("layout=%s is specified in /etc/machine-info.", layout);
+                log_debug("layout=%s is specified in %s.", layout, p);
                 free_and_replace(arg_install_layout, layout);
         }