From 46dcf6afe968e261a0a2e53f991c058630afaf1b Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Fri, 15 Jun 2018 15:06:00 +0200 Subject: [PATCH] Make 20-grub.install to exit if there is no machine ID set The kernel-install plugins are called with an environment variable named $KERNEL_INSTALL_MACHINE_ID, which is set to the machine ID read from the /etc/machine-id file. If the file doesn't exist or is empty, the variable is empty and $BOOT_DIR_ABS is set to a temporary directory that's removed after all the plugins exit. So if $KERNEL_INSTALL_MACHINE_ID is not set, just exit the script since installing a kernel BootLoaderSpec fragment won't be possible anyways. Resolves: rhbz#1576573 Signed-off-by: Javier Martinez Canillas --- 20-grub.install | 4 ++++ grub2.spec | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/20-grub.install b/20-grub.install index 8c6ae68..a6959c5 100755 --- a/20-grub.install +++ b/20-grub.install @@ -1,5 +1,9 @@ #!/bin/bash +if ! [[ $KERNEL_INSTALL_MACHINE_ID ]]; then + exit 0 +fi + [[ -f /etc/default/grub ]] && . /etc/default/grub [[ -f /etc/os-release ]] && . /etc/os-release diff --git a/grub2.spec b/grub2.spec index 166a4f5..4679073 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -453,6 +453,10 @@ fi %endif %changelog +* Fri Jun 15 2018 Javier Martinez Canillas - 2.02-38 +- Make 20-grub.install to exit if there is no machine ID set + Resolves: rhbz#1576573 + * Thu Jun 07 2018 Javier Martinez Canillas - 2.02-37 - More fixes for BLS Resolves: rhbz#1588184