rpms/cpuspeed/F-8 cpuspeed.init,1.36,1.37 cpuspeed.spec,1.62,1.63

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/cpuspeed/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15755

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
* Wed Mar 12 2008 Jarod Wilson <jwilson at redhat.com> 1.2.1-6
- Minor formatting and redirection fixups



Index: cpuspeed.init
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/F-8/cpuspeed.init,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- cpuspeed.init	14 Feb 2008 22:43:24 -0000	1.36
+++ cpuspeed.init	13 Mar 2008 02:14:21 -0000	1.37
@@ -37,7 +37,7 @@
 governor_is_module() {
   # Check to see if the requested cpufreq governor
   # is provided as a kernel module or not
-  module_info=`/sbin/modinfo cpufreq-${governor} 2>&1 > /dev/null`
+  module_info=`/sbin/modinfo cpufreq-${governor}`
   return $?
 }
 
@@ -111,9 +111,9 @@
 
 start() {
   if [ ! -f $lockfile ] && [ ! -d "$xendir" ]; then
+    cpu_vendor=$(awk '/vendor_id/{print $3}' /proc/cpuinfo | tail -n 1)
+    cpu_family=$(awk '/cpu family/{print $4}' /proc/cpuinfo | tail -n 1)
     if ! some_file_exist $testpat ; then
-      cpu_vendor=$(grep vendor_id /proc/cpuinfo | awk '{print $3}' | tail -n 1)
-      cpu_family=$(grep "cpu family" /proc/cpuinfo | awk '{print $4}' | tail -n 1)
       # Attempt to load scaling_driver if not loaded
       # but it is configured
       if [ -n "$DRIVER" ]; then
@@ -121,11 +121,11 @@
       elif [ "$cpu_vendor" == AuthenticAMD ] && [ "$cpu_family" -ge 7 ]; then
         # Try loading powernow-k8 if this is an AMD processor,
         # family 7 or greater (Athlon XP/MP was family 6)
-	pk8m=$(/sbin/modinfo powernow-k8 2>&1 > /dev/null)
-	if [ "$?" -eq 0 ]; then
+        pk8m=$(/sbin/modinfo powernow-k8 > /dev/null 2>&1)
+        if [ "$?" -eq 0 ]; then
           /sbin/modprobe powernow-k8 2> /dev/null
           [ -d ${cpu0freqd} ] || /sbin/modprobe -r powernow-k8 2> /dev/null
-	fi
+        fi
       else
         if [ -d /proc/acpi ]; then
           # use ACPI as a fallback 


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/F-8/cpuspeed.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- cpuspeed.spec	14 Feb 2008 22:43:24 -0000	1.62
+++ cpuspeed.spec	13 Mar 2008 02:14:21 -0000	1.63
@@ -1,7 +1,7 @@
 Summary:        CPU frequency adjusting daemon
 Name:           cpuspeed
 Version:        1.2.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPL
@@ -89,6 +89,9 @@
 exit 0
 
 %changelog
+* Wed Mar 12 2008 Jarod Wilson <jwilson at redhat.com> 1.2.1-6
+- Minor formatting and redirection fixups
+
 * Thu Feb 14 2008 Jarod Wilson <jwilson at redhat.com> 1.2.1-5
 - Support for powernow-k8 as a kernel module