diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-26 14:55:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-26 14:55:12 +0200 |
| commit | b212daa92f3a596efa87b6ccaa097f70cd34bb10 (patch) | |
| tree | 11d945f47836e9aef2f83e2c461ff4da191b081c /contrib/cirrus/lib.sh | |
| parent | eca157fb54d860215695b8e1de8a10cd1c836772 (diff) | |
| parent | ac5ad9acbf93106b39505803d9ed230c8c87fea9 (diff) | |
| download | podman-b212daa92f3a596efa87b6ccaa097f70cd34bb10.tar.gz podman-b212daa92f3a596efa87b6ccaa097f70cd34bb10.tar.bz2 podman-b212daa92f3a596efa87b6ccaa097f70cd34bb10.zip | |
Merge pull request #3632 from cevich/small_cirrus_fixes
Small cirrus and image-build fixes
Diffstat (limited to 'contrib/cirrus/lib.sh')
| -rw-r--r-- | contrib/cirrus/lib.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index a9da3f4ce..737ca3c01 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -358,11 +358,14 @@ systemd_banish(){ set +e # Not all of these exist on every platform for unit in $EVIL_UNITS do - ooe.sh sudo systemctl stop $unit - ooe.sh sudo systemctl disable $unit - ooe.sh sudo systemctl disable $unit.timer - ooe.sh sudo systemctl mask $unit - ooe.sh sudo systemctl mask $unit.timer + echo "Banishing $unit (ignoring errors)" + ( + sudo systemctl stop $unit + sudo systemctl disable $unit + sudo systemctl disable $unit.timer + sudo systemctl mask $unit + sudo systemctl mask $unit.timer + ) &> /dev/null done set -e } |