diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2012-03-20 15:24:26 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2012-03-20 15:24:26 -0400 |
| commit | 8ce435fb4fcdf055db0b81007579ea76c003cdd6 (patch) | |
| tree | 5876130ab7ebf3fed839a1fdd700ec1ae7e0ca5d /src/share/m/subkey_to_ssh_agent | |
| parent | df0fa237a75d9651a441c347ec9feaf453b30ad6 (diff) | |
add --batch to gpg invocations, since gpg2 requires it to use --passphrase-* arguments
Diffstat (limited to 'src/share/m/subkey_to_ssh_agent')
| -rw-r--r-- | src/share/m/subkey_to_ssh_agent | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/share/m/subkey_to_ssh_agent b/src/share/m/subkey_to_ssh_agent index 4bd2234..8802639 100644 --- a/src/share/m/subkey_to_ssh_agent +++ b/src/share/m/subkey_to_ssh_agent @@ -106,7 +106,7 @@ You might want to run 'monkeysphere gen-subkey'." else # we're adding the subkey: mkfifo "$workingdir/$kname" - gpg_user --passphrase-fd 3 3<"$workingdir/passphrase" \ + gpg_user --batch --passphrase-fd 3 3<"$workingdir/passphrase" \ --export-options export-reset-subkey-passwd,export-minimal,no-export-attributes \ --export-secret-subkeys --no-armor "0x${subkey}!" | openpgp2ssh "$subkey" > "$workingdir/$kname" & (cd "$workingdir" && DISPLAY=nosuchdisplay SSH_ASKPASS=/bin/false ssh-add "$@" "$kname" </dev/null )& |