diff options
| author | Chris Evich <cevich@redhat.com> | 2019-07-24 10:48:23 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-07-25 13:51:33 -0400 |
| commit | ceb3d762980d56fb48fd9650df065e3211834805 (patch) | |
| tree | f2ffee1280f066a5d031a41f030be49ab21078b3 | |
| parent | e3082762fe9fefe5788496c32141a5d336a3d7c8 (diff) | |
| download | podman-ceb3d762980d56fb48fd9650df065e3211834805.tar.gz podman-ceb3d762980d56fb48fd9650df065e3211834805.tar.bz2 podman-ceb3d762980d56fb48fd9650df065e3211834805.zip | |
Cirrus: Silence systemd-banish noise
It's somewhat hard to predict which units are certinly present
for any given base-image. Therefore, at image-build time, it's
distracting and unhelpful to see all the errors about units that
don't exist, on every platform. Simply ignore them and rely on
the `check_image.sh` test to confirm none are enabled.
Signed-off-by: Chris Evich <cevich@redhat.com>
| -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 } |