From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 20 May 2019 10:07:39 +0000 (+0200)
Subject: also filter by cpu flags
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-nagios.git;a=commitdiff_plain;h=707f53188e122c957988a3370ab22887d87db1e6

also filter by cpu flags
---

diff --git a/dsa-nagios-checks/checks/dsa-check-ucode-intel b/dsa-nagios-checks/checks/dsa-check-ucode-intel
index 33f3c88..5d03b52 100755
--- a/dsa-nagios-checks/checks/dsa-check-ucode-intel
+++ b/dsa-nagios-checks/checks/dsa-check-ucode-intel
@@ -23,7 +23,8 @@
 
 
 cpu_sig="$(iucode_tool --scan-system 2>&1 | sed -e 's/.*with signature //')"
-avail_line="$(iucode_tool -l  -S -tb /lib/firmware/intel-ucode 2>&1 | grep "sig[[:space:]]*$cpu_sig")"
+cpu_flags="$(cat /sys/devices/system/cpu/cpu0/microcode/processor_flags)"
+avail_line="$(iucode_tool -l -s "$cpu_sig,$cpu_flags" -tb /lib/firmware/intel-ucode 2>&1 | grep "sig[[:space:]]*$cpu_sig")"
 avail="$(echo "$avail_line" | sed -e 's/.*rev[[:space:]]*//; s/[,[:space:]].*//')"
 
 if [ -z "$avail" ]; then