Update to 0.4.6-2

1 files changed, 6 insertions, 31 deletions

diff --git a/phc-k8.sh b/phc-k8.sh
index 734c76c5f92e..c777d9e5c1d8 100644
--- a/phc-k8.sh
+++ b/phc-k8.sh
@@ -15,19 +15,19 @@ start)
 	;;
 stop)
 	echo ':: Resetting default PHC VIDs'
-	for i in /sys/devices/system/cpu/cpu*/cpufreq; do
-		[ -e "$i/phc_default_vids" -a -e "$i/phc_vids" ] && cp "$i"/phc_{default_,}vids
+	for i in /sys/devices/system/cpu/cpu*/cpufreq/phc_vids; do
+		cp "${i%vids}default_vids" "$i"
 	done
 	;;
 status)
 	check_off () {
-		for i in /sys/devices/system/cpu/cpu*/cpufreq; do
-			[ "$(< $i/phc_vids)" = "$(< $i/phc_default_vids)" ] || return;
+		for i in /sys/devices/system/cpu/cpu*/cpufreq/phc_vids; do
+			[ "$(< "$i")" = "$(< "${i%vids}default_vids")" ] || return;
 		done
 	}
 	check_on () {
 		for i in /sys/devices/system/cpu/cpu*/cpufreq/phc_vids; do
-			[[ "$(< $i)" =~ "$VIDS" ]] || return;
+			[[ "$(< "$i")" =~ "$VIDS" ]] || return;
 		done
 	}
 	echo -n 'PHC status: '
@@ -40,31 +40,6 @@ status)
 		echo 'unknown'
 	fi
 	;;
-setup)
-	echo ':: Removing old phc-k8 modules'
-	echo
-	for i in /usr/lib/modules/*; do
-		if [ -f "$i/phc-k8.ko" -a ! -f "$i/version" ]; then
-			rm -f "$i"/{mperf,phc-k8}.ko
-			rmdir --ignore-fail-on-non-empty "$i"
-		elif [ -d "$i/updates/kernel/arch/x86/kernel/cpu/cpufreq" -a ! -d "$i/kernel" ]; then
-			rm -f "$i"/updates/kernel/arch/x86/kernel/cpu/cpufreq/{mperf,phc-k8}.ko
-			rmdir -p --ignore-fail-on-non-empty "$i/updates/kernel/arch/x86/kernel/cpu/cpufreq"
-		fi
-	done
-	echo ':: Compiling new phc-k8 module'
-	echo
-	cd /usr/src/phc-k8/
-	make
-	echo
-	echo ':: Installing new phc-k8 module'
-	echo
-	make install
-	echo
-	echo ':: Cleaning up'
-	echo
-	make clean
-	;;
 set)
 	. /etc/default/phc-k8
 	[ -z "$VIDS" ] && exit
@@ -76,5 +51,5 @@ set)
 	done
 	;;
 *)
-	echo "usage: $0 {start|stop|status|setup|set}"
+	echo "usage: $0 {start|stop|status|set}"
 esac