Fix.

diff --git a/testing/scripts/_setup_secrets_user.sh b/testing/scripts/_setup_secrets_user.sh
index 3c110e86fb4ef7c4adbf1fba86f9172717ce0e6a..0cc1578cae124840eebb0c04f5660a3b806f9106 100644 (file)
--- a/testing/scripts/_setup_secrets_user.sh
+++ b/testing/scripts/_setup_secrets_user.sh
@@ -35,6 +35,7 @@ while [ ! -s "${PATH_PUBLIC_KEY}" ]; do
     set +e
     ssh-keygen -y -f "${PATH_PRIVATE_KEY}" > "${PATH_PUBLIC_KEY}"
     set -e
+    echo ''
 done
 eval $(ssh-agent) && ssh-add
 stty echo
@@ -60,6 +61,7 @@ ls -1 "${PATH_BORGKEYS}/" | while read FILENAME; do
     set +e
     ssh-keyscan "${SERVER_NAME}" >> "${PATH_KNOWN_HOSTS}"
     set -e
+    echo ''
 done
 while true; do
     set +e

diff --git a/testing/scripts/setup_secrets.sh b/testing/scripts/setup_secrets.sh
index 399e46ad6cb1faede7bc06849de8badc7f759f71..ea805010b0406dbf968541b0fc81b3aec19891a5 100755 (executable)
--- a/testing/scripts/setup_secrets.sh
+++ b/testing/scripts/setup_secrets.sh
@@ -29,6 +29,7 @@ expect_min_n_args 1 "(device name, e.g. 'sda')" "$@"
 SECRETS_DEV=$1
 PATH_SOURCE=/media/${SECRETS_DEV}/${PATH_REL_SECRETS}
 PATH_DEV=/dev/${SECRETS_DEV}
+PATH_PMOUNT_ERR="/tmp/err_pmount_$(date +'%s')"
 echo "Put secrets drive into slot for ${PATH_DEV}."
 while [ ! -e "${PATH_DEV}" ]; do
     sleep 0.1
@@ -38,13 +39,15 @@ while true; do
     PASSPHRASE=$(get_passphrase)
     echo ''
     set +e
-    echo "${PASSPHRASE}" | pmount "${PATH_DEV}"
+    echo "${PASSPHRASE}" | pmount "${PATH_DEV}" 2> "${PATH_PMOUNT_ERR}"
     RESULT=$?
     set -e
     if [ "${RESULT}" = "0" ]; then
         break
     elif [ "${RESULT}" != "100" ]; then
-        echo "Aborting due to pmount error."
+        echo "Aborting due to pmount error:"
+       cat "${PATH_PMOUNT_ERR}"
+       rm "${PATH_PMOUNT_ERR}"
        exit 1
     fi
 done