From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sat, 21 Jun 2008 21:08:34 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.2-1~12^2~1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=6a202af09f5a1bc47069e5e36dbdfa3f6b392a5b;hp=bee2295c0e205787584788d1e611e92ec6b0fe96;p=monkeysphere.git

Merge commit 'dkg/master'

Conflicts:

	src/seckey2sshagent
---

diff --git a/src/seckey2sshagent b/src/seckey2sshagent
index 15e2706..aff323f 100755
--- a/src/seckey2sshagent
+++ b/src/seckey2sshagent
@@ -46,4 +46,6 @@ gpg --export-secret-key $GPGID | GNUPGHOME="$FOO" gpg --import
 
 GNUPGHOME="$FOO" gpg --edit-key $GPGID
 
+ln -s /dev/stdin "$FOO"/monkeysphere-key
+
 GNUPGHOME="$FOO" gpg --export-secret-key $GPGID | openpgp2ssh $GPGID | ssh-add -c /dev/stdin