]> git.openpandora.org Git - openembedded.git/commitdiff
opie-init: initscript cosmetics and fixed packaging wrt qpe.conf
authorMichael Krelin <hacker@klever.net>
Sat, 7 Jul 2007 21:40:04 +0000 (21:40 +0000)
committerMichael Krelin <hacker@klever.net>
Sat, 7 Jul 2007 21:40:04 +0000 (21:40 +0000)
packages/opie-init/opie-init.inc
packages/opie-init/opie-init/opie
packages/opie-init/opie-init_1.2.2.bb

index 138d07cb17c1d5f0c10181ff21d1f8d0d3b2390f..04a73cb4ea5f097f10a292629df2753f349d216c 100644 (file)
@@ -41,5 +41,6 @@ do_install() {
 }
 
 #FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}/bin"
+FILES_${PN} += "${palmtopdir}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
index 56c54e0a43d8d85f9634debad8ed8bed778bb5a3..d7e06e5ce2a0bc9b8a6c21687c7cc13846d71f7f 100755 (executable)
@@ -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
 
     ;;
index 9d84d6188b7e8fd58fa5ee06cd18a055db0cc513..b52e162e5000b551ab5462372e76b15527bc9a9a 100644 (file)
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "file://opie-reorgfiles \
            file://opie \