summaryrefslogtreecommitdiffstats
path: root/.github/setup_ci.sh
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2022-08-18 13:36:39 +0200
committerDarren Tucker <dtucker@dtucker.net>2022-08-18 13:36:39 +0200
commit5a5c580b48fc6006bdfa731fc2f6d4945c2c0e4e (patch)
treed639ce2c01369191435ab7375fe771d963820713 /.github/setup_ci.sh
parenton Cygwin, prefer WinHello FIDO device (diff)
downloadopenssh-5a5c580b48fc6006bdfa731fc2f6d4945c2c0e4e.tar.xz
openssh-5a5c580b48fc6006bdfa731fc2f6d4945c2c0e4e.zip
Check for perms to run agent-getpeereid test.
Ubuntu 22.04 defaults to private home dirs which prevents "nobody" running ssh-add during the agent-getpeereid test. Check for this and add the necessary permissions.
Diffstat (limited to '')
-rwxr-xr-x.github/setup_ci.sh12
1 files changed, 11 insertions, 1 deletions
diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index fe5e13ff0..7dec34bee 100755
--- a/.github/setup_ci.sh
+++ b/.github/setup_ci.sh
@@ -19,7 +19,17 @@ export DEBIAN_FRONTEND=noninteractive
set -ex
-lsb_release -a
+if [ -x "`which lsb_release 2>&1`" ]; then
+ lsb_release -a
+fi
+
+# Ubuntu 22.04 defaults to private home dirs which prevent the
+# agent-getpeerid test from running ssh-add as nobody. See
+# https://github.com/actions/runner-images/issues/6106
+if [ ! -z "$SUDO" ] && ! "$SUDO" -u nobody test -x ~; then
+ echo ~ is not executable by nobody, adding perms.
+ chmod go+x ~
+fi
if [ "${TARGETS}" = "kitchensink" ]; then
TARGETS="krb5 libedit pam sk selinux"