From e166b10c99f1544cebe1ccac40130f6ea4d7d850 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Jan 06 2021 20:11:51 +0000 Subject: Apply patch ci-Fix-unit-failure-of-cloud-final.service-if-NetworkMa.patch patch_name: ci-Fix-unit-failure-of-cloud-final.service-if-NetworkMa.patch present_in_specfile: true location_in_specfile: 12 --- diff --git a/rhel/systemd/cloud-final.service b/rhel/systemd/cloud-final.service index 05add07..e281c0c 100644 --- a/rhel/systemd/cloud-final.service +++ b/rhel/systemd/cloud-final.service @@ -11,8 +11,11 @@ ExecStart=/usr/bin/cloud-init modules --mode=final RemainAfterExit=yes TimeoutSec=0 KillMode=process -ExecStartPost=/bin/echo "trying to reload or restart NetworkManager.service" -ExecStartPost=/usr/bin/systemctl try-reload-or-restart NetworkManager.service +# Restart NetworkManager if it is present and running. +ExecStartPost=/bin/sh -c 'u=NetworkManager.service; \ + out=$(systemctl show --property=SubState $u) || exit; \ + [ "$out" = "SubState=running" ] || exit 0; \ + systemctl reload-or-try-restart $u' # Output needs to appear in instance console output StandardOutput=journal+console