diff options
| author | Michael Krelin <hacker@klever.net> | 2007-07-07 21:40:04 +0000 |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2007-07-07 21:40:04 +0000 |
| commit | c3d32cc108b6ad1a02aed24fd155d19107899b20 (patch) | |
| tree | 2f072c96b13a34b88ed940bce7c5703c9c3453e3 | |
| parent | 9449f65081793367ff48ae377dd4868eb5fa511c (diff) | |
opie-init: initscript cosmetics and fixed packaging wrt qpe.conf
| -rw-r--r-- | packages/opie-init/opie-init.inc | 1 | ||||
| -rwxr-xr-x | packages/opie-init/opie-init/opie | 6 | ||||
| -rw-r--r-- | packages/opie-init/opie-init_1.2.2.bb | 2 |
3 files changed, 5 insertions, 4 deletions
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 \ |