pandora-libpnd: bump and fix init scripts

diff --git a/recipes/pandora-system/pandora-libpnd.bb b/recipes/pandora-system/pandora-libpnd.bb
index 23bf353..0d47bff 100755 (executable)
--- a/recipes/pandora-system/pandora-libpnd.bb
+++ b/recipes/pandora-system/pandora-libpnd.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Support for the PND format in Pandora images (lib, daemon, init script etc.)"
 LICENSE = "lGPL"
 
 DESCRIPTION = "Support for the PND format in Pandora images (lib, daemon, init script etc.)"
 LICENSE = "lGPL"
 

-PR = "r65"
+PR = "r66"

 
 PARALLEL_MAKE = ""
 
 
 PARALLEL_MAKE = ""
 


@@ -14,7 +14,7 @@ SRC_URI = " \
           file://op_pnd_run.desktop \
 "
 
           file://op_pnd_run.desktop \
 "
 

-SRCREV = "6a341aef9eef530d83e653a5adbe828a1e8cfece"
+SRCREV = "fbe6b2fab92cc1897014b23c8a645e80c2531142"

 
 S = "${WORKDIR}/git"
 
 
 S = "${WORKDIR}/git"
 

diff --git a/recipes/pandora-system/pandora-libpnd/rc.pndevmapperd b/recipes/pandora-system/pandora-libpnd/rc.pndevmapperd
index c3072fb..a063e9c 100644 (file)
--- a/recipes/pandora-system/pandora-libpnd/rc.pndevmapperd
+++ b/recipes/pandora-system/pandora-libpnd/rc.pndevmapperd
@@ -8,13 +8,13 @@
 # Default-Stop:      0 1 6
 ### END INIT INFO
  
 # Default-Stop:      0 1 6
 ### END INIT INFO
  

-PID=`pidof -o %PPID -x pndevmapperd`

 PNDEVMAPPER='/usr/bin/pndevmapperd' #adjust
 
 DESC="Pandora PND Event Deamon"
 NAME="pndevmapperd"
 
 d_stop() {
 PNDEVMAPPER='/usr/bin/pndevmapperd' #adjust
 
 DESC="Pandora PND Event Deamon"
 NAME="pndevmapperd"
 
 d_stop() {

+       PID=`pidof -o %PPID -x pndevmapperd`

        if [ $PID ]
        then
                kill $PID
        if [ $PID ]
        then
                kill $PID


@@ -24,6 +24,7 @@ d_stop() {
 }
 
 d_start() {
 }
 
 d_start() {

+       PID=`pidof -o %PPID -x pndevmapperd`

        if [ $PID ]
        then
                echo "$DESC: $NAME already running."
        if [ $PID ]
        then
                echo "$DESC: $NAME already running."


@@ -33,6 +34,7 @@ d_start() {
 }
 
 d_reload() {
 }
 
 d_reload() {

+       PID=`pidof -o %PPID -x pndevmapperd`

        if [ $PID ]
        then
                kill -HUP $PID
        if [ $PID ]
        then
                kill -HUP $PID


@@ -43,26 +45,22 @@ d_reload() {
 
 case "$1" in
   start)
 
 case "$1" in
   start)

-       echo -n "Starting $DESC: $NAME"
+       echo "Starting $DESC: $NAME"

        d_start &
        d_start &

-       echo "."

        ;;
   stop)
        ;;
   stop)

-       echo -n "Stopping $DESC: $NAME"
+       echo "Stopping $DESC: $NAME"

        d_stop
        d_stop

-       echo "."

        ;;
   reload)
        ;;
   reload)

-       echo -n "Reloading $DESC: $NAME"
+       echo "Reloading $DESC: $NAME"

        d_reload
        d_reload

-       echo "."

        ;;      
   restart|force-reload)
        ;;      
   restart|force-reload)

-       echo -n "Restarting $DESC: $NAME"
+       echo "Restarting $DESC: $NAME"

        d_stop
        sleep 1
        d_start
        d_stop
        sleep 1
        d_start

-       echo "."

        ;;
   *)
        echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
        ;;
   *)
        echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2

diff --git a/recipes/pandora-system/pandora-libpnd/rc.pndnotifyd b/recipes/pandora-system/pandora-libpnd/rc.pndnotifyd
index 448279b..1e3799f 100644 (file)
--- a/recipes/pandora-system/pandora-libpnd/rc.pndnotifyd
+++ b/recipes/pandora-system/pandora-libpnd/rc.pndnotifyd
@@ -8,13 +8,13 @@
 # Default-Stop:      0 1 6
 ### END INIT INFO
  
 # Default-Stop:      0 1 6
 ### END INIT INFO
  

-PID=`pidof -o %PPID -x pndnotifyd`

 PNDNOTIFY='/usr/bin/pndnotifyd' #adjust
 
 DESC="Pandora PND Deamon"
 NAME="pndnotifyd"
 
 d_stop() {
 PNDNOTIFY='/usr/bin/pndnotifyd' #adjust
 
 DESC="Pandora PND Deamon"
 NAME="pndnotifyd"
 
 d_stop() {

+       PID=`pidof -o %PPID -x pndnotifyd`

        if [ $PID ]
        then
                kill $PID
        if [ $PID ]
        then
                kill $PID


@@ -24,6 +24,7 @@ d_stop() {
 }
 
 d_start() {
 }
 
 d_start() {

+       PID=`pidof -o %PPID -x pndnotifyd`

        if [ $PID ]
        then
                echo "$DESC: $NAME already running."
        if [ $PID ]
        then
                echo "$DESC: $NAME already running."


@@ -33,6 +34,7 @@ d_start() {
 }
 
 d_reload() {
 }
 
 d_reload() {

+       PID=`pidof -o %PPID -x pndnotifyd`

        if [ $PID ]
        then
                kill -HUP $PID
        if [ $PID ]
        then
                kill -HUP $PID


@@ -43,26 +45,22 @@ d_reload() {
 
 case "$1" in
   start)
 
 case "$1" in
   start)

-       echo -n "Starting $DESC: $NAME"
+       echo "Starting $DESC: $NAME"

        d_start &
        d_start &

-       echo "."

        ;;
   stop)
        ;;
   stop)

-       echo -n "Stopping $DESC: $NAME"
+       echo "Stopping $DESC: $NAME"

        d_stop
        d_stop

-       echo "."

        ;;
   reload)
        ;;
   reload)

-       echo -n "Reloading $DESC: $NAME"
+       echo "Reloading $DESC: $NAME"

        d_reload
        d_reload

-       echo "."

        ;;      
   restart|force-reload)
        ;;      
   restart|force-reload)

-       echo -n "Restarting $DESC: $NAME"
+       echo "Restarting $DESC: $NAME"

        d_stop
        sleep 1
        d_start
        d_stop
        sleep 1
        d_start

-       echo "."

        ;;
   *)
        echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
        ;;
   *)
        echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2