From d8914ff762cd626312793c41984e470ffba73f6c Mon Sep 17 00:00:00 2001
From: Steve Wills <swills@FreeBSD.org>
Date: Mon, 15 Jan 2018 17:05:37 +0000
Subject: sysutils/devcpu-data: fix rc script

PR:		225173
Reviewed by:	sbruno
Approved by:	portmgr (implicit)
MFH:		2018Q1
---
 sysutils/devcpu-data/Makefile                  | 2 +-
 sysutils/devcpu-data/files/microcode_update.in | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'sysutils/devcpu-data')

diff --git a/sysutils/devcpu-data/Makefile b/sysutils/devcpu-data/Makefile
index 327ecfcb1dc0..126e21b5ce89 100644
--- a/sysutils/devcpu-data/Makefile
+++ b/sysutils/devcpu-data/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	data
 PORTVERSION=	1.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	https://downloadmirror.intel.com/27431/eng/:intel \
 		LOCAL/sbruno:amd
diff --git a/sysutils/devcpu-data/files/microcode_update.in b/sysutils/devcpu-data/files/microcode_update.in
index 91a5fca0730c..8b8f741159cf 100644
--- a/sysutils/devcpu-data/files/microcode_update.in
+++ b/sysutils/devcpu-data/files/microcode_update.in
@@ -56,11 +56,16 @@ microcode_update_start()
 		    (echo "Microcode Update Failed." && exit 1)
 	done
 	if [ "${microcode_cpus}" = "ALL" ]; then
-			${CMT} -e /dev/cpuctl${i} >/dev/null 2>&1
+                CPUCONTROL_UPDATED=$(cpucontrol -h 2>&1 | grep -q -- -e; echo $?)
+                if [ ${CPUCONTROL_UPDATED} -ne 0 ]; then
+                        echo "Please update your system in order to update CPU microcode."
+                else
+			${CMT} -e /dev/cpuctl0 >/dev/null 2>&1
 			if [ $? -ne 0 ]; then
-				echo "Re-evalutation of CPU flags Failed."
+				echo "Re-evalulation of CPU flags Failed."
 				exit 1
 			fi
+                fi
 	fi
 	echo "Done."
 }
-- 
cgit v1.2.3