diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-14 15:44:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-14 15:44:58 +0200 |
| commit | 1322b41aa09d9cd9c4a51a7b69ff0e92df37a90b (patch) | |
| tree | 1ad63348d83311df5ae71099aacf6c55566bf355 /contrib | |
| parent | 0ea95da7b9fcbcbe7e4ebab78f2950972c70ba68 (diff) | |
| parent | 8440656fd5a6d61a23a0985cfcdbe421de42498d (diff) | |
| download | podman-1322b41aa09d9cd9c4a51a7b69ff0e92df37a90b.tar.gz podman-1322b41aa09d9cd9c4a51a7b69ff0e92df37a90b.tar.bz2 podman-1322b41aa09d9cd9c4a51a7b69ff0e92df37a90b.zip | |
Merge pull request #3320 from cevich/fix_ssh_race
Cirrus: Guarantee ssh is running for rootless
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/lib.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 462fa332a..97901cfc7 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -211,6 +211,8 @@ setup_rootless() { # Works with older versions of bash printf "${_env_var_name}=%q\n" "$(printenv $_env_var_name)" >> "/home/$ROOTLESS_USER/.bashrc" done + echo "Ensure the systems ssh process is up and running" + systemctl --wait restart sshd # a regular 'start' could hang forever } # Helper/wrapper script to only show stderr/stdout on non-zero exit |