diff options
| author | Michael Krelin <hacker@klever.net> | 2007-05-29 23:59:30 +0000 |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2007-05-29 23:59:30 +0000 |
| commit | 6a5bc66adc297f3752b104503ded699fedc3afc1 (patch) | |
| tree | 6a75e35b0de9dc3e15aa614bd605d3052c271443 | |
| parent | 5af7f410fe9982037b406f5d3d952d3864589c8b (diff) | |
opie-init: spawn ssh-agent separately. Closes #1729
| -rwxr-xr-x | packages/opie-init/opie-init/opie | 11 | ||||
| -rw-r--r-- | packages/opie-init/opie-init_1.2.2.bb | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie index 63eeb7b47d..1aa5fdf0b2 100755 --- a/packages/opie-init/opie-init/opie +++ b/packages/opie-init/opie-init/opie @@ -53,17 +53,15 @@ case $1 in $OPIEDIR/bin/opie-login -terminal 3 else $OPIEDIR/bin/opie-reorgfiles - if [ -x /usr/bin/ssh-agent ]; then - SSHAGENT=/usr/bin/ssh-agent - else - SSHAGENT="" - fi if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh fi echo Starting Opie.... - $SSHAGENT $OPIEDIR/bin/qpe -terminal 3 + ( + test -x /usr/bin/ssh-agent && eval $(/usr/bin/ssh-agent -s) && echo $SSH_AGENT_PID>/var/run/opie-ssh-agent.pid ; + $OPIEDIR/bin/qpe -terminal 3 + ) 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 @@ -83,6 +81,7 @@ case $1 in 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 true ;; diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb index bc1a4bc4e6..d54813eb7b 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 = "r2" +PR = "r3" SRC_URI = "file://opie-reorgfiles \ file://opie \ |