opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-17 15:08:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3320 from cevich/fix_ssh_race

Browse Source 
Cirrus: Guarantee ssh is running for rootless
This commit is contained in:
OpenShift Merge Robot
2019-06-14 15:44:58 +02:00
committed by GitHub
parent 0ea95da7b9 8440656fd5
commit 1322b41aa0
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/cirrus/lib.sh
View File

@ -211,6 +211,8 @@ setup_rootless() {
# Works with older versions of bash # Works with older versions of bash
printf "${_env_var_name}=%q\n" "$(printenv $_env_var_name)" >> "/home/$ROOTLESS_USER/.bashrc" printf "${_env_var_name}=%q\n" "$(printenv $_env_var_name)" >> "/home/$ROOTLESS_USER/.bashrc"
done 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 # Helper/wrapper script to only show stderr/stdout on non-zero exit