From: Michael Krelin <hacker@klever.net>
Date: Sat, 7 Jul 2007 21:40:04 +0000 (+0000)
Subject: opie-init: initscript cosmetics and fixed packaging wrt qpe.conf
X-Git-Tag: Release-2010-05/1~8868^2~189^2~3^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3d32cc108b6ad1a02aed24fd155d19107899b20;p=openembedded.git

opie-init: initscript cosmetics and fixed packaging wrt qpe.conf
---

diff --git a/packages/opie-init/opie-init.inc b/packages/opie-init/opie-init.inc
index 138d07cb17..04a73cb4ea 100644
--- a/packages/opie-init/opie-init.inc
+++ b/packages/opie-init/opie-init.inc
@@ -41,5 +41,6 @@ do_install() {
 }
 
 #FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}/bin"
+FILES_${PN} += "${palmtopdir}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie
index 56c54e0a43..d7e06e5ce2 100755
--- a/packages/opie-init/opie-init/opie
+++ b/packages/opie-init/opie-init/opie
@@ -70,7 +70,7 @@ case $1 in
 	    echo "Starting qss" >>/var/log/opie-qss.log
 	    qss </dev/null >>/var/log/opie-qss.log 2>&1
 	    echo "qss exited, will try to restart" >>/var/log/opie-qss.log
-	done; rm /var/run/opie-qss-loop.pid; } &
+	done; rm /var/run/opie-qss-loop.pid; } </dev/null >/dev/null 2>&1 &
 	echo $! >/var/run/opie-qss-loop.pid
     fi
 
@@ -78,12 +78,12 @@ case $1 in
 
 '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
+    test -r /var/run/opie-qss-loop.pid && kill $(cat /var/run/opie-qss-loop.pid) 2>/dev/null ; rm -f /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 ; rm /var/run/opie-ssh-agent.pid
+    test -r /var/run/opie-ssh-agent.pid && kill $(cat /var/run/opie-ssh-agent.pid) 2>/dev/null ; rm -f /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 9d84d6188b..b52e162e50 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 = "r7"
+PR = "r8"
 
 SRC_URI = "file://opie-reorgfiles \
            file://opie \