From 15ff7830132480d904772a5ffe3372713c8e3e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 20 May 2025 14:31:53 +0200 Subject: [PATCH 1/2] kernel-install/90-loaderentry.install: print message if quiting because of KERNEL_INSTALL_LAYOUT 60-ukify.install prints a message like this, and it is quite useful when trying to figure out what is going on. --- src/kernel-install/90-loaderentry.install.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/kernel-install/90-loaderentry.install.in b/src/kernel-install/90-loaderentry.install.in index 832a82794c..75c0b47aca 100755 --- a/src/kernel-install/90-loaderentry.install.in +++ b/src/kernel-install/90-loaderentry.install.in @@ -26,7 +26,11 @@ ENTRY_DIR_ABS="${3:?}" KERNEL_IMAGE="$4" INITRD_OPTIONS_SHIFT=4 -[ "$KERNEL_INSTALL_LAYOUT" = "bls" ] || exit 0 +if [ "$KERNEL_INSTALL_LAYOUT" != "bls" ]; then + [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && \ + echo "KERNEL_INSTALL_LAYOUT=$KERNEL_INSTALL_LAYOUT, quitting." + exit 0 +fi MACHINE_ID="${KERNEL_INSTALL_MACHINE_ID:?}" ENTRY_TOKEN="${KERNEL_INSTALL_ENTRY_TOKEN:?}" From 4092f72274d1b4d8212df559638327ff35ab011f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 20 May 2025 14:41:15 +0200 Subject: [PATCH 2/2] kernel-install: print entry-token path that was not found --- src/kernel-install/kernel-install.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/kernel-install/kernel-install.c b/src/kernel-install/kernel-install.c index 4a743ac316..73dcc37c91 100644 --- a/src/kernel-install/kernel-install.c +++ b/src/kernel-install/kernel-install.c @@ -787,7 +787,9 @@ static int context_ensure_layout(Context *c) { /* There's no metadata in $BOOT_ROOT, and apparently no entry token directory installed? Then we * really don't know anything. */ c->layout = LAYOUT_OTHER; - log_debug("Entry-token directory not found, using layout=%s.", layout_to_string(c->layout)); + log_debug("Entry-token directory %s not found, using layout=%s.", + entry_token_path, + layout_to_string(c->layout)); return 0; }