input etoken PIN only on commandline
This commit is contained in:
parent
8b85d7dc9c
commit
566d5f88d5
1 changed files with 8 additions and 0 deletions
|
@ -157,6 +157,12 @@ logtrace " SSH_IDENTITIES_DIR: $SSH_IDENTITIES_DIR"
|
||||||
|
|
||||||
agent-start-or-restart () {
|
agent-start-or-restart () {
|
||||||
|
|
||||||
|
# If DISPLAY is set, ssh-add calls ssh-askpass, and if its in remote-terminal, it wont work
|
||||||
|
# So remember and unset DISPLAY, and set it at the end again, if it was set before
|
||||||
|
[ $DISPLAY ] && local DISPLAY_ORIG=$DISPLAY
|
||||||
|
[ $DISPLAY ] && logtrace "unset DISPLAY: $DISPLAY"
|
||||||
|
[ $DISPLAY ] && unset DISPLAY
|
||||||
|
|
||||||
ENTRY
|
ENTRY
|
||||||
local ssh_identity
|
local ssh_identity
|
||||||
local agentfile
|
local agentfile
|
||||||
|
@ -240,6 +246,8 @@ $(ssh-runinagent $agentfile ssh-add -l)"
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
[ $DISPLAY_ORIG ] && logtrace "reset DISPLAY=$DISPLAY_ORIG"
|
||||||
|
[ $DISPLAY_ORIG ] && export DISPLAY=$DISPLAY_ORIG
|
||||||
EXIT
|
EXIT
|
||||||
return $ret
|
return $ret
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue