diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-13 18:01:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-13 18:01:52 +0100 |
| commit | 15220af08ce2346686e54851a6d498ec573e950c (patch) | |
| tree | 95507d870e38e835c4398630a96dda6d1d342a3b /contrib/cirrus | |
| parent | 7a693a1946d201825bcd0933f565f07047312c70 (diff) | |
| parent | 8d928d525ffa8147d34d0f148e0aec6189461318 (diff) | |
| download | podman-15220af08ce2346686e54851a6d498ec573e950c.tar.gz podman-15220af08ce2346686e54851a6d498ec573e950c.tar.bz2 podman-15220af08ce2346686e54851a6d498ec573e950c.zip | |
Merge pull request #4497 from onlyjob/master
codespell: spelling corrections
Diffstat (limited to 'contrib/cirrus')
| -rw-r--r-- | contrib/cirrus/lib.sh | 6 | ||||
| -rwxr-xr-x | contrib/cirrus/packer/systemd_banish.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 297ed49ce..2e43a59f6 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -12,7 +12,7 @@ HOME="$(getent passwd $USER | cut -d : -f 6)" [[ -n "$UID" ]] || UID=$(getent passwd $USER | cut -d : -f 3) GID=$(getent passwd $USER | cut -d : -f 4) -# Essential default paths, many are overriden when executing under Cirrus-CI +# Essential default paths, many are overridden when executing under Cirrus-CI export GOPATH="${GOPATH:-/var/tmp/go}" if type -P go &> /dev/null then @@ -82,7 +82,7 @@ PERIODIC_APT_RE='^(APT::Periodic::.+")1"\;' LILTO="timeout_attempt_delay_command 24s 5 30s" BIGTO="timeout_attempt_delay_command 300s 5 30s" -# Safe env. vars. to transfer from root -> $ROOTLESS_USER (go env handled separetly) +# Safe env. vars. to transfer from root -> $ROOTLESS_USER (go env handled separately) ROOTLESS_ENV_RE='(CIRRUS_.+)|(ROOTLESS_.+)|(.+_IMAGE.*)|(.+_BASE)|(.*DIRPATH)|(.*FILEPATH)|(SOURCE.*)|(DEPEND.*)|(.+_DEPS_.+)|(OS_REL.*)|(.+_ENV_RE)|(TRAVIS)|(CI.+)|(TEST_REMOTE.*)' # Unsafe env. vars for display SECRET_ENV_RE='(IRCID)|(ACCOUNT)|(GC[EP]..+)|(SSH)' @@ -319,7 +319,7 @@ setup_rootless() { tee -a /etc/subuid >> /etc/subgid # Env. vars set by Cirrus and setup_environment.sh must be explicitly - # transfered to the test-user. + # transferred to the test-user. echo "Configuring rootless user's environment variables:" echo "# Added by $GOSRC/$SCRIPT_PATH/lib.sh setup_rootless()" _ENV_VAR_NAMES=$(awk 'BEGIN{for(v in ENVIRON) print v}' | \ diff --git a/contrib/cirrus/packer/systemd_banish.sh b/contrib/cirrus/packer/systemd_banish.sh index 396cf906c..6e2dd9c3e 100755 --- a/contrib/cirrus/packer/systemd_banish.sh +++ b/contrib/cirrus/packer/systemd_banish.sh @@ -3,7 +3,7 @@ set +e # Not all of these exist on every platform # This is intended to be executed on VMs as a startup script on initial-boot. -# Alternativly, it may be executed with the '--list' option to return the list +# Alternatively, it may be executed with the '--list' option to return the list # of systemd units defined for disablement (useful for testing). EVIL_UNITS="cron crond atd apt-daily-upgrade apt-daily fstrim motd-news systemd-tmpfiles-clean" |