Bug#823075: cpufrequtils: Fix LSB init output

[Guillem Jover]

Source: cpufrequtils
Source-Version: 008-1
Severity: wishlist
Tags: patch

Hi!

The attached patch fixes the LSB init script to have more consistent
output.

Thanks,
Guillem

From 49c15a5eeaf2287f295a79549be73114db3d93a7 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guil...@debian.org>
Date: Sat, 30 Apr 2016 15:33:15 +0200
Subject: [PATCH] cpufrequtils: Fix LSB init output

---
 debian/cpufrequtils.init             |  9 ++++-----
 debian/cpufrequtils.loadcpufreq.init | 10 +++++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/cpufrequtils.init b/debian/cpufrequtils.init
index ccca089..6071cc0 100644
--- a/debian/cpufrequtils.init
+++ b/debian/cpufrequtils.init
@@ -77,18 +77,17 @@ CPUS=$(cat /proc/stat|sed -ne 's/^cpu\([[:digit:]]\+\).*/\1/p')
 RETVAL=0
 case "$1" in
 	start|force-reload|restart|reload)
-		log_action_begin_msg "$DESC: Setting $GOVERNOR CPUFreq governor"
+		log_begin_msg "Setting $GOVERNOR CPUFreq governor..."
 		if check_governor_avail ; then
 			for cpu in $CPUS ; do
-				log_action_cont_msg "CPU${cpu}"
+				log_progress_msg "CPU${cpu}"
 				$CPUFREQ_SET --cpu $cpu $CPUFREQ_OPTIONS 2>&1 > /dev/null || \
 					RETVAL=$?
 			done
-			log_action_end_msg $RETVAL ""
 		else
-			log_action_cont_msg "disabled, governor not available"
-			log_action_end_msg $RETVAL
+			log_progress_msg "disabled, governor not available"
 		fi
+		log_end_msg $RETVAL
 		;;
 	stop)
 		;;
diff --git a/debian/cpufrequtils.loadcpufreq.init b/debian/cpufrequtils.loadcpufreq.init
index c536e18..725e81b 100644
--- a/debian/cpufrequtils.loadcpufreq.init
+++ b/debian/cpufrequtils.loadcpufreq.init
@@ -167,6 +167,7 @@ load_modules() {
         for mod in $MODAVAIL; do
         #        echo "     $mod"
                 echo $LIST| grep -q -w "$mod" || $MODPROBE $mod >/dev/null || /bin/true
+                log_progress_msg "$mod"
         done
 
         #cpufreq is built in on powerpc; just return
@@ -191,6 +192,9 @@ load_modules() {
 		    fi
 		fi
         fi
+        if [ -n "$MODULE" ]; then
+                log_progress_msg "$MODULE"
+        fi
 }
 
 check_kernel() {
@@ -207,13 +211,13 @@ check_kernel() {
 
 case "$1" in
   start)
-       	log_action_begin_msg "Loading cpufreq kernel modules"
+        log_begin_msg "Loading cpufreq kernel modules..."
         [ -f /proc/modules ] && load_modules
 	if check_kernel ; then
 	    [ -z "$MODULE" ] && MODULE="none"
-	    log_action_end_msg 0 "$MODULE"
+	    log_end_msg 0
 	else
-	    log_action_end_msg 1
+	    log_end_msg 1
 	fi
 	;;
   stop)
-- 
2.8.1