Add an option to unload the microcode kernel module after we are done using it #116790 by ilGino.

Package-Manager: portage-2.1_pre2

4 files changed, 34 insertions, 15 deletions

diff --git a/sys-apps/microcode-ctl/ChangeLog b/sys-apps/microcode-ctl/ChangeLog
index 5c5187fc2212..2b3e172eee64 100644
--- a/sys-apps/microcode-ctl/ChangeLog
+++ b/sys-apps/microcode-ctl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/microcode-ctl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/ChangeLog,v 1.13 2005/09/15 00:45:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/ChangeLog,v 1.14 2005/12/26 21:01:37 vapier Exp $
+
+  26 Dec 2005; Mike Frysinger <vapier@gentoo.org>
+  files/microcode_ctl.conf.d, files/microcode_ctl.rc:
+  Add an option to unload the microcode kernel module after we are done using
+  it #116790 by ilGino.
 
 *microcode-ctl-1.12 (15 Sep 2005)
 
diff --git a/sys-apps/microcode-ctl/Manifest b/sys-apps/microcode-ctl/Manifest
index 0263da9e2497..a3bb963dc4ce 100644
--- a/sys-apps/microcode-ctl/Manifest
+++ b/sys-apps/microcode-ctl/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 7a07fdb4e83ab7205be0bf0d180d3467 microcode-ctl-1.12.ebuild 1169
-MD5 46861b4fb632e925e1fee37c41c02ee7 microcode-ctl-1.11.ebuild 1186
-MD5 cac2e308eb60e19c1f18e7652af548b5 ChangeLog 2691
-MD5 e8b0bb1b0be1aef5fcb99663b9457b35 files/microcode_ctl.rc 618
-MD5 23438cd1b63d7190967405e42ad1a0f6 files/microcode_ctl.conf.d 267
+MD5 603c35133c422da6a183a6f3b5e3caad ChangeLog 2898
 MD5 95e076b988c73349d2606d4ecd052a56 files/digest-microcode-ctl-1.11 70
 MD5 717fe335882b48bdae85f62c28883120 files/digest-microcode-ctl-1.12 70
+MD5 6458858fff894d2d77aae536c697ebf5 files/microcode_ctl.conf.d 210
+MD5 44cffc4c0ce1036aa22076db246dbd14 files/microcode_ctl.rc 761
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 46861b4fb632e925e1fee37c41c02ee7 microcode-ctl-1.11.ebuild 1186
+MD5 7a07fdb4e83ab7205be0bf0d180d3467 microcode-ctl-1.12.ebuild 1169
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDKMQjgIKl8Uu19MoRAicZAJ0Q0lrftzn0DTnuD80qLxG0I6wxEgCfeQnJ
-uo3qKlPOn1omyHLFKqDDjms=
-=mQjb
+iD8DBQFDsFpE2+ySkm8kpY0RAsTSAKDCbCmiSR+CBmkHpFqvI5KSnJoXFACfYMje
+TnOT7GkWpejbnapemmN9WxY=
+=s4LQ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/microcode-ctl/files/microcode_ctl.conf.d b/sys-apps/microcode-ctl/files/microcode_ctl.conf.d
index 9e3e7c6cf6d5..0505a80ae92b 100644
--- a/sys-apps/microcode-ctl/files/microcode_ctl.conf.d
+++ b/sys-apps/microcode-ctl/files/microcode_ctl.conf.d
@@ -1,5 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/files/microcode_ctl.conf.d,v 1.3 2005/01/08 01:17:49 vapier Exp $
+# /etc/conf.d/microcode_ctl
+
+# Device to pass to microcode_ctl
 
 MICROCODE_DEV="/dev/cpu/microcode"
+
+
+# Should we try to unload the microcode module after we
+# update the cpu microcode ?
+
+MICROCODE_UNLOAD="yes"
diff --git a/sys-apps/microcode-ctl/files/microcode_ctl.rc b/sys-apps/microcode-ctl/files/microcode_ctl.rc
index fe60aa9995ff..f71e17d26b1a 100644
--- a/sys-apps/microcode-ctl/files/microcode_ctl.rc
+++ b/sys-apps/microcode-ctl/files/microcode_ctl.rc
@@ -1,18 +1,26 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/files/microcode_ctl.rc,v 1.3 2005/01/08 01:17:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/files/microcode_ctl.rc,v 1.4 2005/12/26 21:01:37 vapier Exp $
 
 depend() {
 	need localmount
 }
 
 start() {
+	local ret
+
 	# Make sure the kernel supports the microcode device ...
 	# if it doesnt, try to modprobe the kernel module
 	grep -qo ' microcode$' /proc/misc || modprobe microcode >& /dev/null
 
 	ebegin "Updating microcode"
 	/usr/sbin/microcode_ctl -qu -d ${MICROCODE_DEV}
-	eend $? "Failed to update microcode via '${MICROCODE_DEV}'"
+	ret=$?
+	eend ${ret} "Failed to update microcode via '${MICROCODE_DEV}'"
+
+	[[ ${MICROCODE_UNLOAD} == "1" || ${MICROCODE_UNLOAD} == "yes" ]] \
+		&& rmmod microcode >& /dev/null
+
+	return ${ret}
 }