File irqbindall-rename-irq_balancer-to-irqbalance.diff of Package ibmrtpkgs.15904

Subject: Rename irq_balancer -> irqbalance
From: Mike Galbraith <mgalbraith@suse.de>
References: bnc#966818

Signed-off-by: Mike Galbraith <mgalbraith@suse.de>
---
 config/config.sh      |    6 +++---
 irqbindall/irqbindall |   13 ++++---------
 2 files changed, 7 insertions(+), 12 deletions(-)

--- a/config/config.sh
+++ b/config/config.sh
@@ -115,12 +115,12 @@ setterm -blank 0 < /dev/tty1 > /dev/tty1
 check_sysctl_setting kernel.sysrq 1
 
 #-----------------------------------------------------------------------#
-# Configure irqbindall and irq_balancer services                        #
+# Configure irqbindall and irqbalance services                        #
 #-----------------------------------------------------------------------#
 
-info "Turning irqbindall on and irq_balancer off."
+info "Turning irqbindall on and irqbalance off."
 $CHKCONFIG irqbindall on
-$CHKCONFIG irq_balancer off
+$CHKCONFIG -s irqbalance off
 
 info "All changes were successfully executed."
 
--- a/irqbindall/irqbindall
+++ b/irqbindall/irqbindall
@@ -16,16 +16,16 @@
 prog=irqbindall
 
 start() {
-	if [ -r /proc/irq/prof_cpu_mask ]
+	if [ -r /proc/irq/default_smp_affinity ]
 	then
-		cpumask="$(cat /proc/irq/prof_cpu_mask)"
+		cpumask="$(cat /proc/irq/default_smp_affinity)"
 	else 
 		cpumask="fffffff"
 	fi
 
 	#disable irq balancer
 	echo "Stopping irq balancer"
-	/etc/init.d/irq_balancer stop > /dev/null
+	systemctl stop irqbalance > /dev/null
 
 	echo -n "Binding interrupts to cpu_mask: $cpumask... "
 	exec 3>&1
@@ -42,11 +42,6 @@ start() {
 	return 0
 }
 
-rhstatus() {
-   status irqbindall
-}
-
-
 case "$1" in
   start)
         start
@@ -64,7 +59,7 @@ case "$1" in
 	start
         ;;
   status)
-        rhstatus
+        rc_status -v
         ;;
   *)
         echo $"Usage: $prog {start|stop|status|restart|reload|condrestart}"