Compare commits
2 commits
0104508044
...
0654a3d00b
Author | SHA1 | Date | |
---|---|---|---|
|
0654a3d00b | ||
|
c9730d5b8a |
3 changed files with 4 additions and 2 deletions
|
@ -43,6 +43,7 @@ EOF
|
|||
|
||||
check_token(){
|
||||
|
||||
[ -n "${P11M:+x}" ] && export PKCS11_MODULE=${P11M}
|
||||
# it's the same as "token" in functions.sh
|
||||
# defined here also, to work also in environments, where functions.sh couldn't be sourced
|
||||
[ -z "${PKCS11_MODULE:+x}" ] && { PKCS11_MODULE=$P11M; export PKCS11_MODULE; }
|
||||
|
@ -58,7 +59,7 @@ check_token(){
|
|||
logtrace "tmppubkey: $tmppubkey"
|
||||
loginfo "$(ssh-add -L > $tmppubkey)"
|
||||
# Check if public-keys in tmppubkey are working. They are not working, if you removed and add back hardware-token.
|
||||
loginfo "$(ssh-add -T ${tmppubkey}|| { ssh-add -e $PKCS11_MODUlE; ssh-add -s $PKCS11_MODUlE; } )"
|
||||
loginfo "$(ssh-add -T ${tmppubkey}|| { ssh-add -e $PKCS11_MODULE; ssh-add -s $PKCS11_MODULE; } )"
|
||||
logdebug "$(rm "${tmppubkey}")"
|
||||
logdebug "$(ssh-add -l )"
|
||||
[ $DISPLAY_ORIG ] && logtrace "reset DISPLAY=$DISPLAY_ORIG"
|
||||
|
|
2
sshs
2
sshs
|
@ -11,7 +11,7 @@ sshs() {
|
|||
|
||||
local f
|
||||
local TMPBASHCONFIG=$(mktemp -p ${XDG_RUNTIME_DIR} -t bashrc.XXXXXXXX --suffix=.conf)
|
||||
local FILELIST=( "${MSC_BASE}/functions.sh" "${MSC_BASE}/logging" "${MSC_BASE}/myshell_load_fortmpconfig" $(getbashrcfile) ~/.aliases "${MSC_BASE}/aliases" "${MSC_BASE}/PS1" "${MSC_BASE}/bash_completion.d/*" )
|
||||
# local FILELIST=( "${MSC_BASE}/functions.sh" "${MSC_BASE}/logging" "${MSC_BASE}/myshell_load_fortmpconfig" $(getbashrcfile) ~/.bash_aliases "${MSC_BASE}/aliases" "${MSC_BASE}/PS1" "${MSC_BASE}/bash_completion.d/*" )
|
||||
|
||||
logdebug "FILELIST: ${FILELIST[@]}"
|
||||
if [ -e "${HOME}/.config/myshellconfig/sshs_addfiles.conf" ] ; then
|
||||
|
|
|
@ -2,6 +2,7 @@ ${MSC_BASE}/functions.sh
|
|||
${MSC_BASE}/logging
|
||||
${MSC_BASE}/myshell_load_fortmpconfig
|
||||
$(getbashrcfile) ~/.aliases
|
||||
$(getbashrcfile) ~/.bash_aliases
|
||||
${MSC_BASE}/aliases
|
||||
${MSC_BASE}/PS1
|
||||
${MSC_BASE}/bash_completion.d/*
|
||||
|
|
Loading…
Reference in a new issue