Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 Jul 2023 11:31:36 GMT
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 18bc11a2bc16 - main - sysutils/devcpu-data: Fix typo in rc script
Message-ID:  <202307311131.36VBVaGx054989@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by garga:

URL: https://cgit.FreeBSD.org/ports/commit/?id=18bc11a2bc16e0cf649464f17312c6092a19780d

commit 18bc11a2bc16e0cf649464f17312c6092a19780d
Author:     Thomas Hurst <tom@hur.st>
AuthorDate: 2023-07-31 11:29:04 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2023-07-31 11:30:47 +0000

    sysutils/devcpu-data: Fix typo in rc script
    
    The microcode_update rc script spells "required_modules" as
    "requires_modules", masking this by duplicating the missing
    functionality in its own precmd.
    
    This patch fixes the typo and removes the superfluous precmd.
    
    PR:             272781
    Approved by:    sbruno (maintainer)
---
 sysutils/devcpu-data/Makefile                  |  1 +
 sysutils/devcpu-data/files/microcode_update.in | 13 +------------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/sysutils/devcpu-data/Makefile b/sysutils/devcpu-data/Makefile
index 639501ac8550..b8f7e54f2af0 100644
--- a/sysutils/devcpu-data/Makefile
+++ b/sysutils/devcpu-data/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	data
 PORTVERSION=	20230617
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	devcpu-
diff --git a/sysutils/devcpu-data/files/microcode_update.in b/sysutils/devcpu-data/files/microcode_update.in
index b06b21d6f903..e2ad59592c06 100644
--- a/sysutils/devcpu-data/files/microcode_update.in
+++ b/sysutils/devcpu-data/files/microcode_update.in
@@ -21,22 +21,11 @@
 name="microcode_update"
 rcvar=microcode_update_enable
 stop_cmd=":"
-start_precmd="microcode_update_prepare"
 start_cmd="microcode_update_start"
-requires_modules="cpuctl"
+required_modules="cpuctl"
 
 CMT="/usr/sbin/cpucontrol"
 
-microcode_update_prepare()
-{
-	if ! kldstat -q -m cpuctl; then
-		if ! kldload cpuctl > /dev/null 2>&1; then
-			warn "Can't load cpuctl module."
-			return 1
-		fi
-	fi
-}
-
 microcode_update_start()
 {
 	echo "Updating CPU Microcode..."



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307311131.36VBVaGx054989>