opie-init: better tracking of certain processed PIDs for cleaner startup/shutdown.

2 files changed, 5 insertions, 3 deletions

diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie
index 1aa5fdf0b2..4a7a9e4330 100755
--- a/packages/opie-init/opie-init/opie
+++ b/packages/opie-init/opie-init/opie
@@ -70,18 +70,20 @@ case $1 in
 	    echo "Starting qss" >>/var/log/opie-qss.log
 	    $OPIEDIR/bin/qss </dev/null >>/var/log/opie-qss.log 2>&1
 	    echo "qss exited, will try to restart" >>/var/log/opie-qss.log
-	done; } &
+	done; rm /var/run/opie-qss-loop.pid; } &
+	echo $! >/var/run/opie-qss-loop.pid
     fi
 
     ;;
 
 'stop')
     echo "Stopping Opie..."
+    test -r /var/run/opie-qss-loop.pid && kill $(cat /var/run/opie-qss-loop.pid) 2>/dev/null ; rm /var/run/opie-qss-loop.pid
     killall qss 2>/dev/null
     killall qpe 2>/dev/null
     killall opie-login 2>/dev/null
     killall quicklauncher 2>/dev/null
-    test -r /var/run/opie-ssh-agent.pid && kill $(cat /var/run/opie-ssh-agent.pid) 2>/dev/null
+    test -r /var/run/opie-ssh-agent.pid && kill $(cat /var/run/opie-ssh-agent.pid) 2>/dev/null ; rm /var/run/opie-ssh-agent.pid
     true
 
     ;;
diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb
index d54813eb7b..ca10d61221 100644
--- a/packages/opie-init/opie-init_1.2.2.bb
+++ b/packages/opie-init/opie-init_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://opie-reorgfiles \
            file://opie \