From 67f7b47dcbfa109f32cee9d5b2fe65b9bfb26ee8 Mon Sep 17 00:00:00 2001 From: Laszlo Toth Date: Tue, 18 Sep 2018 14:21:07 +0200 Subject: [PATCH] Fix kernel detection when /lib/kernel exists on a distro Commit b48b2177b725 ("feat: Add Clear Linux Distro (#244)") broke kernel detection for distros using that directory for other purposes than storing the kernel image. Example: # pacman -Qo /lib/kernel /usr/lib/kernel/ is owned by mkinitcpio 24-2 /usr/lib/kernel/ is owned by systemd 239.2-1 Signed-off-by: Laszlo Toth --- spectre-meltdown-checker.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spectre-meltdown-checker.sh b/spectre-meltdown-checker.sh index ebae021..c7f4e98 100755 --- a/spectre-meltdown-checker.sh +++ b/spectre-meltdown-checker.sh @@ -1516,7 +1516,8 @@ if [ "$opt_live" = 1 ]; then [ -e "/etc/machine-id" ] && [ -e "/boot/$(cat /etc/machine-id)/$(uname -r)/linux" ] && opt_kernel="/boot/$(cat /etc/machine-id)/$(uname -r)/linux" # Clear Linux: str_uname=$(uname -r) - [ -e "/lib/kernel" ] && opt_kernel="/lib/kernel/org.clearlinux.${str_uname##*.}.${str_uname%.*}" + clear_linux_kernel="/lib/kernel/org.clearlinux.${str_uname##*.}.${str_uname%.*}" + [ -e "$clear_linux_kernel" ] && opt_kernel=$clear_linux_kernel fi # system.map