diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-06 04:01:16 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-06 04:01:16 +0000 |
| commit | 355557d69033685a666dda3ae874d4d79ea0f2e8 (patch) | |
| tree | be2151d18b5fd577a1cc424cea5d1bba397b08b2 | |
| parent | fdf839d6f96e2807292432547c81771e82987911 (diff) | |
| parent | 5a8c4dad38e1f3c4a8b959b5d4f1a3672f18491e (diff) | |
merge of '2df01515901ff96b1df8ddfe5a959db31e864f7a'
and '5a0c2498be96fb8ae42c90b19f42b7dd4761f996'
| -rwxr-xr-x | packages/opie-init/opie-init/opie | 13 | ||||
| -rw-r--r-- | packages/opie-init/opie-init_1.2.2.bb | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie index 8f08732797..63eeb7b47d 100755 --- a/packages/opie-init/opie-init/opie +++ b/packages/opie-init/opie-init/opie @@ -64,17 +64,26 @@ case $1 in fi echo Starting Opie.... $SSHAGENT $OPIEDIR/bin/qpe -terminal 3 - sleep 1 - $OPIEDIR/bin/qss </dev/null >/var/log/opie-qss.log 2>&1 & + echo -n >/var/log/opie-qss.log + test -x $OPIEDIR/bin/qpe && { for attempt in 0 1 2 3 4 5 6 7 8 9 a b c d e f ; do + sleep 1 + echo "Waiting for qcop to startup: $attempt ..." >>/var/log/opie-qss.log + $OPIEDIR/bin/qcop QPE/System 'ping()' || continue + 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; } & fi ;; 'stop') echo "Stopping Opie..." + killall qss 2>/dev/null killall qpe 2>/dev/null killall opie-login 2>/dev/null killall quicklauncher 2>/dev/null + true ;; diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb index 47cca4f066..bc1a4bc4e6 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 = "r1" +PR = "r2" SRC_URI = "file://opie-reorgfiles \ file://opie \ |