diff options
| -rw-r--r-- | dot_config/systemd/user/ssh-agent.service.d/override.conf | 3 | ||||
| -rw-r--r-- | dot_local/lib/openssh/executable_agent-launch | 47 |
2 files changed, 50 insertions, 0 deletions
diff --git a/dot_config/systemd/user/ssh-agent.service.d/override.conf b/dot_config/systemd/user/ssh-agent.service.d/override.conf new file mode 100644 index 0000000..acb0fb7 --- /dev/null +++ b/dot_config/systemd/user/ssh-agent.service.d/override.conf @@ -0,0 +1,3 @@ +[Service] +ExecStart= +ExecStart=/home/rak/.local/lib/openssh/agent-launch start diff --git a/dot_local/lib/openssh/executable_agent-launch b/dot_local/lib/openssh/executable_agent-launch new file mode 100644 index 0000000..36e06ff --- /dev/null +++ b/dot_local/lib/openssh/executable_agent-launch @@ -0,0 +1,47 @@ +#!/bin/sh +# helper script for launching ssh-agent, used by systemd unit +set -e + +options="$(getopt -o '' -l help -- "$@")" || exit 1 +eval set -- "$options" + +if [ ! -d "$XDG_RUNTIME_DIR" ]; then + # shellcheck disable=SC2016 + echo 'This needs $XDG_RUNTIME_DIR to be set' >&2 + exit 1 +fi + +while :; do + case $1 in + --help) + echo 'Usage:' >&2 + echo " $0 start [-- ssh-agent options]" >&2 + echo " $0 stop" + exit 0 + ;; + --) + shift + break + ;; + *) + echo "Unexpected argument: $1" >&2 + exit 1 + ;; + esac +done + +if [ "$1" = start ]; then + shift + if [ ! -S "$SSH_AUTH_SOCK" ] && grep -s -q '^use-ssh-agent$' /etc/X11/Xsession.options; then + S="$XDG_RUNTIME_DIR/openssh_agent" + dbus-update-activation-environment --verbose --systemd SSH_AUTH_SOCK="$S" SSH_AGENT_LAUNCHER=openssh + exec ssh-agent -D -a "$S" "$@" + fi +elif [ "$1" = stop ]; then + if [ "$SSH_AGENT_LAUNCHER" = openssh ]; then + dbus-update-activation-environment --systemd SSH_AUTH_SOCK= + fi +else + echo "Unknown command $1" >&2 + exit 1 +fi |