[oe-commits] org.oe.dev opie-init: spawn ssh-agent separately. Closes #1729

[polyonymous commit]

opie-init: spawn ssh-agent separately. Closes #1729

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: 99133b6a252718e1e4b91a43a3a2dc3b7a6cfbdd
ViewMTN: http://monotone.openembedded.org/revision.psp?id=99133b6a252718e1e4b91a43a3a2dc3b7a6cfbdd
Files:
1
packages/opie-init/opie-init/opie
packages/opie-init/opie-init_1.2.2.bb
Diffs:

#
# mt diff -r7cf4ac5d4d4d640cbb7ff29222fd607d72387dc1 -r99133b6a252718e1e4b91a43a3a2dc3b7a6cfbdd
#
# 
# 
# patch "packages/opie-init/opie-init/opie"
#  from [ddfc2ac7d88cbeb2a8e7464f327c6f8748e5f6dd]
#    to [45062b55aab9273fe62f7c61445543fdaab4279c]
# 
# patch "packages/opie-init/opie-init_1.2.2.bb"
#  from [2a5558f178c042d55df990b8ebd1d0c021875f10]
#    to [c00802362eff6fbfce05f5703780500c5af00efe]
# 
============================================================
--- packages/opie-init/opie-init/opie	ddfc2ac7d88cbeb2a8e7464f327c6f8748e5f6dd
+++ packages/opie-init/opie-init/opie	45062b55aab9273fe62f7c61445543fdaab4279c
@@ -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
 
     ;;
============================================================
--- packages/opie-init/opie-init_1.2.2.bb	2a5558f178c042d55df990b8ebd1d0c021875f10
+++ packages/opie-init/opie-init_1.2.2.bb	c00802362eff6fbfce05f5703780500c5af00efe
@@ -1,5 +1,5 @@ require ${PN}.inc
 require ${PN}.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "file://opie-reorgfiles \
            file://opie \