rpms/microcode_ctl/devel microcode_ctl.init, 1.14, 1.15 microcode_ctl.spec, 1.53, 1.54
Dave Jones
davej at fedoraproject.org
Fri Sep 11 18:36:23 UTC 2009
Author: davej
Update of /cvs/pkgs/rpms/microcode_ctl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17507
Modified Files:
microcode_ctl.init microcode_ctl.spec
Log Message:
Remove some unnecessary code from the init script.
Index: microcode_ctl.init
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/microcode_ctl.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- microcode_ctl.init 25 Jun 2009 23:35:01 -0000 1.14
+++ microcode_ctl.init 11 Sep 2009 18:36:22 -0000 1.15
@@ -2,20 +2,9 @@
# chkconfig: 2345 0 99
# description: script to apply cpu microcode
-# vars:
-#
-# START distribution specific way of kicking programs
-# END distribution specific way of checking return status
-# PROGRAM the executable to run
-# ARGUMENTS the argument we're going to call PROGRAM with
-
# Check that we're a priviledged user
[ `id -u` = 0 ] || exit 0
-DEVICE=/dev/cpu/microcode
-ARGUMENTS=-Qu
-RETVAL=0
-PROGRAM=/sbin/microcode_ctl
DATAFILE=/lib/firmware/microcode.dat
. /etc/init.d/functions
@@ -44,38 +33,22 @@ function start ()
/sbin/modprobe microcode
lt=0
- while [ ! -c $DEVICE ]; do
+ while [ ! -c /dev/cpu/microcode ]; do
lt=$[lt+1];
[ $lt -gt 5 ] && break;
sleep 0.1;
done
- # Lets just be sure we have a device file...
- if [ ! -e $DEVICE ]; then
- echo $"$0: microcode device $DEVICE doesn't exist?"
- exit 1
- elif [ ! -c $DEVICE ]; then
- echo $"$0: $DEVICE not a character device?"
- exit 1
- fi
-
- daemon $PROGRAM $ARGUMENTS
+ /sbin/microcode_ctl -Qu
RETVAL=$?
- # trap the most common case, errno 19 = no device
- if [ $RETVAL -eq 19 ]; then
- echo $"$0: kernel does not have CPU microcode device support"
- fi
/sbin/rmmod microcode
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/microcode_ctl
return $RETVAL
}
stop()
{
- rm -f /var/lock/subsys/microcode_ctl
}
case "$1" in
@@ -87,7 +60,7 @@ case "$1" in
stop
;;
restart|reload|force-reload)
- stop
+ stop
start
;;
status)
Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/microcode_ctl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- microcode_ctl.spec 25 Jul 2009 12:10:29 -0000 1.53
+++ microcode_ctl.spec 11 Sep 2009 18:36:23 -0000 1.54
@@ -1,7 +1,7 @@
Summary: Tool to update x86/x86-64 CPU microcode.
Name: microcode_ctl
Version: 1.17
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.1
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
Epoch: 1
Group: System Environment/Base
License: GPLv2+
@@ -78,6 +78,9 @@ family=`cat /proc/cpuinfo | grep "^cpu f
exit 0
%changelog
+* Fri Sep 11 2009 Dave Jones <davej at redhat.com>
+- Remove some unnecessary code from the init script.
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.17-1.52.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list