f-dd

aiidalab · Oct 13, 2023 · 1ca249f · 1ca249f
1 parent 9f9a9af
commit 1ca249f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/stack/base/before-notebook.d/10_prepare-home-config.sh b/stack/base/before-notebook.d/10_prepare-home-config.sh
@@ -42,7 +42,11 @@ if [[ -f /opt/bin/load-singlesshagent.sh ]] && ! grep -q "${header}" /home/${NB_
 ${header}
 if [ -f /opt/bin/load-singlesshagent.sh ]; then
     source /opt/bin/load-singlesshagent.sh
-    ssh-add /home/${NB_USER}/.ssh/id_rsa 2> /dev/null
 fi
 EOF
 fi
+
+# load the ssh-agent and add the default key generated
+# the return code can be non-zero if the ssh-agent is not running
+# which will cause the notebook to fail to start so we need to ignore the return code
+source /opt/bin/load-singlesshagent.sh || true
diff --git a/stack/base/load-singlesshagent.sh b/stack/base/load-singlesshagent.sh
@@ -44,8 +44,8 @@ load_singlesshagent() {
     elif [ "$SSHADD_RETVAL" == "1" ]
     then
         [ "$VERBOSE" == "true" ] && echo "  - ssh-agent found (${SSH_AGENT_PID}), no keys (I might want to add keys here)" >&2
-        # Maybe the user wants to do it by himself?
-        #ssh-add
+        # run ssh-add to add the default generate key `id_rsa` to the agent
+        ssh-add ~/.ssh/id_rsa
     elif [ "$SSHADD_RETVAL" == "0" ]
     then
         NUMKEYS=`echo "$SSH_ADD_OUTPUT" | wc -l`