From ee49b7b71d017097be5b4a0f32bff83379b0a86e Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Mon, 18 Mar 2019 12:53:23 +0100 Subject: [PATCH] Print default image even if isn't a suitable one The grubby --default-kernel option only prints the default kernel if this is a suitable one. That is if its associated kernel cmdline root param is the same than the partition currently mounted as the filesystem root. But the grubby --set-default option doesn't have that restriction, it is able to set a kernel as the default even if its root is for a different partition. So make the --default-kernel option to also print the kernel in this case. Still check if is a suitable image so --debug can tell it. Resolves: rhbz#1323842 Signed-off-by: Javier Martinez Canillas --- grubby.c | 5 +++-- test/results/debug/g2.1 | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/grubby.c b/grubby.c index 9c506aeb438..a7f823cb58c 100644 --- a/grubby.c +++ b/grubby.c @@ -5531,8 +5531,9 @@ int main(int argc, const char **argv) entry = findEntryByIndex(config, config->defaultImage); if (!entry) return 0; - if (!suitableImage(entry, bootPrefix, 0, flags)) - return 0; + + /* check if is a suitable image but still print it */ + suitableImage(entry, bootPrefix, 0, flags); line = getLineByType(LT_KERNEL | LT_HYPER | LT_KERNEL_EFI | diff --git a/test/results/debug/g2.1 b/test/results/debug/g2.1 index f5187f5f4b5..d579b59e59f 100644 --- a/test/results/debug/g2.1 +++ b/test/results/debug/g2.1 @@ -12,3 +12,4 @@ DBG: linux /vmlinuz-2.6.38.8-32.fc15.x86_64 root=/dev/mapper/vg_pjones5-lv_root DBG: echo 'Loading initial ramdisk ...' DBG: initrd /initramfs-2.6.38.8-32.fc15.x86_64.img DBG: } +/boot/vmlinuz-2.6.38.8-32.fc15.x86_64 -- 2.20.1