Patchwork [meta-oe] lmsensors: fix fancontrol init script

login
register
mail settings
Submitter Marc Ferland
Date June 25, 2013, 3:35 p.m.
Message ID <1372174539-18297-1-git-send-email-ferlandm@sonatest.com>
Download mbox | patch
Permalink /patch/52327/
State New
Headers show

Comments

Marc Ferland - June 25, 2013, 3:35 p.m.
Make the 'fancontrol stop' command work again by using the fancontrol
pid file instead of matching the process by name. While at it, also do
a bit of cleaning.

Signed-off-by: Marc Ferland <ferlandm@sonatest.com>
---
 meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
Paul Eggleton - June 25, 2013, 4:19 p.m.
On Tuesday 25 June 2013 11:35:39 Marc Ferland wrote:
> Make the 'fancontrol stop' command work again by using the fancontrol
> pid file instead of matching the process by name. While at it, also do
> a bit of cleaning.
> 
> Signed-off-by: Marc Ferland <ferlandm@sonatest.com>
> ---
>  meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init
> b/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init index
> f179310..4433020 100644
> --- a/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init
> +++ b/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init
> @@ -1,4 +1,4 @@
> -#! /bin/sh
> +#!/bin/sh
>  ### BEGIN INIT INFO
>  # Provides:          fancontrol
>  # Required-Start:    $local_fs
> @@ -16,8 +16,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
>  DESC="fan control daemon"
>  NAME="fancontrol"
>  FANCONTROL=`which $NAME`
> -
> -. /etc/init.d/functions || exit 1
> +PIDFILE="/var/run/fancontrol.pid"
> 
>  # Exit if the package is not installed
>  [ -x "$FANCONTROL" ] || exit 0
> @@ -25,12 +24,12 @@ FANCONTROL=`which $NAME`
>  case "$1" in
>      start)
>          echo -n "Starting $DESC: $NAME... "
> -        /sbin/start-stop-daemon -S -x $FANCONTROL -b -- $FANCONTROL_ARGS
> +        start-stop-daemon -S -p $PIDFILE -b -x $FANCONTROL
>          echo "done."
>          ;;
>      stop)
>          echo -n "Stopping $DESC: $NAME... "
> -        /sbin/start-stop-daemon -K -x $FANCONTROL
> +        start-stop-daemon -K -p $PIDFILE
>          echo "done."
>          ;;
>      restart)

This is a patch against meta-oe, so it needs to go to openembedded-
devel@lists.openembedded.org.

Cheers,
Paul

Patch

diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init b/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init
index f179310..4433020 100644
--- a/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init
+++ b/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init
@@ -1,4 +1,4 @@ 
-#! /bin/sh
+#!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          fancontrol
 # Required-Start:    $local_fs
@@ -16,8 +16,7 @@  PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="fan control daemon"
 NAME="fancontrol"
 FANCONTROL=`which $NAME`
-
-. /etc/init.d/functions || exit 1
+PIDFILE="/var/run/fancontrol.pid"
 
 # Exit if the package is not installed
 [ -x "$FANCONTROL" ] || exit 0
@@ -25,12 +24,12 @@  FANCONTROL=`which $NAME`
 case "$1" in
     start)
         echo -n "Starting $DESC: $NAME... "
-        /sbin/start-stop-daemon -S -x $FANCONTROL -b -- $FANCONTROL_ARGS
+        start-stop-daemon -S -p $PIDFILE -b -x $FANCONTROL
         echo "done."
         ;;
     stop)
         echo -n "Stopping $DESC: $NAME... "
-        /sbin/start-stop-daemon -K -x $FANCONTROL
+        start-stop-daemon -K -p $PIDFILE
         echo "done."
         ;;
     restart)