mirror of
https://github.com/speed47/spectre-meltdown-checker.git
synced 2024-09-08 01:38:02 +02:00
fix: pine64: re-add vmlinuz location and some error checks
This commit is contained in:
parent
2551295541
commit
bda18d04a0
@ -339,7 +339,7 @@ is_cpu_specex_free()
|
|||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
[ "$cpu_family" -eq 4 ] && return 0
|
[ "$cpu_family" = 4 ] && return 0
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -918,6 +918,8 @@ if [ "$opt_live" = 1 ]; then
|
|||||||
[ -e "/boot/vmlinuz-linux" ] && opt_kernel="/boot/vmlinuz-linux"
|
[ -e "/boot/vmlinuz-linux" ] && opt_kernel="/boot/vmlinuz-linux"
|
||||||
# Linux-Libre:
|
# Linux-Libre:
|
||||||
[ -e "/boot/vmlinuz-linux-libre" ] && opt_kernel="/boot/vmlinuz-linux-libre"
|
[ -e "/boot/vmlinuz-linux-libre" ] && opt_kernel="/boot/vmlinuz-linux-libre"
|
||||||
|
# pine64
|
||||||
|
[ -e "/boot/pine64/Image" ] && opt_kernel="/boot/pine64/Image"
|
||||||
# generic:
|
# generic:
|
||||||
[ -e "/boot/vmlinuz-$(uname -r)" ] && opt_kernel="/boot/vmlinuz-$(uname -r)"
|
[ -e "/boot/vmlinuz-$(uname -r)" ] && opt_kernel="/boot/vmlinuz-$(uname -r)"
|
||||||
[ -e "/boot/kernel-$( uname -r)" ] && opt_kernel="/boot/kernel-$( uname -r)"
|
[ -e "/boot/kernel-$( uname -r)" ] && opt_kernel="/boot/kernel-$( uname -r)"
|
||||||
@ -1259,6 +1261,8 @@ check_redhat_canonical_spectre()
|
|||||||
|
|
||||||
if ! which strings >/dev/null 2>&1; then
|
if ! which strings >/dev/null 2>&1; then
|
||||||
redhat_canonical_spectre=-1
|
redhat_canonical_spectre=-1
|
||||||
|
elif [ -n "$vmlinux_err" ]; then
|
||||||
|
redhat_canonical_spectre=-2
|
||||||
else
|
else
|
||||||
# Red Hat / Ubuntu specific variant1 patch is difficult to detect,
|
# Red Hat / Ubuntu specific variant1 patch is difficult to detect,
|
||||||
# let's use the same way than the official Red Hat detection script,
|
# let's use the same way than the official Red Hat detection script,
|
||||||
@ -1328,6 +1332,8 @@ check_variant1()
|
|||||||
check_redhat_canonical_spectre
|
check_redhat_canonical_spectre
|
||||||
if [ "$redhat_canonical_spectre" = -1 ]; then
|
if [ "$redhat_canonical_spectre" = -1 ]; then
|
||||||
pstatus yellow UNKNOWN "missing 'strings' tool, please install it, usually it's in the binutils package"
|
pstatus yellow UNKNOWN "missing 'strings' tool, please install it, usually it's in the binutils package"
|
||||||
|
elif [ "$redhat_canonical_spectre" = -2 ]; then
|
||||||
|
pstatus yellow UNKNOWN "couldn't check ($vmlinux_err)"
|
||||||
elif [ "$redhat_canonical_spectre" = 1 ]; then
|
elif [ "$redhat_canonical_spectre" = 1 ]; then
|
||||||
pstatus green YES
|
pstatus green YES
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user