From: Michael Prokop <mika@grml.org>
Date: Wed, 3 Jun 2020 14:44:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/155'
X-Git-Tag: v0.92~1
X-Git-Url: http://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=31e65a1924740192b8ee249fd0f97b59a33c571b

Merge remote-tracking branch 'origin/pr/155'
---

31e65a1924740192b8ee249fd0f97b59a33c571b
diff --cc grml-debootstrap
index c9bf40e,380bcd4..823d876
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@@ -1811,19 -1820,29 +1822,40 @@@ iface ${interface} inet dhc
          eend 1
          bailout 1
        fi
 +    elif [ -f "$AUTHORIZED_KEYS_SOURCE" ]; then
 +      einfo "copying '$AUTHORIZED_KEYS_SOURCE' to '$AUTHORIZED_KEYS_TARGET' as requested via --sshcopyid option."
 +      mkdir -p "$AUTHORIZED_KEYS_TARGET"
 +      chmod 0700 "$AUTHORIZED_KEYS_TARGET"
 +      if cp "$AUTHORIZED_KEYS_SOURCE" "$AUTHORIZED_KEYS_TARGET" ; then
 +        eend 0
 +      else
 +        eerror "Error: copying '$AUTHORIZED_KEYS_SOURCE' to '$AUTHORIZED_KEYS_TARGET' failed"
 +        eend 1
 +        bailout 1
 +      fi
      else
-       eerror "Could not open a connection to your authentication agent or the agent has no identites."
+       eerror "Error: Could not open a connection to your authentication agent or the agent has no identities."
+       eend 1
+       bailout 1
+     fi
+   fi
+ 
+   if [ -n "${SSHCOPYAUTH}" ] ; then
+     AUTHORIZED_KEYS_SOURCE=${AUTHORIZED_KEYS_SOURCE:-${HOME}/.ssh/authorized_keys}
+ 
+     if ! [ -f "${AUTHORIZED_KEYS_SOURCE}" ]; then
+       eerror "Error: could not read '${AUTHORIZED_KEYS_SOURCE}' for setting up SSH key login."
+       eend 1
+       bailout 1
+     fi
+ 
+     AUTHORIZED_KEYS_TARGET="${MNTPOINT}/root/.ssh/"
+     einfo "Copying '${AUTHORIZED_KEYS_SOURCE}' to '${AUTHORIZED_KEYS_TARGET}' as requested via --sshcopyauth option."
+     mkdir -m 0700 -p "${AUTHORIZED_KEYS_TARGET}"
+     if cp "${AUTHORIZED_KEYS_SOURCE}" "${AUTHORIZED_KEYS_TARGET}" ; then
+       eend 0
+     else
+       eerror "Error: copying '${AUTHORIZED_KEYS_SOURCE}' to '${AUTHORIZED_KEYS_TARGET}' failed."
        eend 1
        bailout 1
      fi