diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl index e682f637a26..3c2c03194c7 100644 --- a/systemd/cloud-init-local.service.tmpl +++ b/systemd/cloud-init-local.service.tmpl @@ -7,10 +7,6 @@ DefaultDependencies=no {% endif %} Wants=network-pre.target After=hv_kvp_daemon.service -{% if variant in ["almalinux", "cloudlinux", "rhel"] %} -Requires=dbus.socket -After=dbus.socket -{% endif %} Before=NetworkManager.service {% if variant in ["almalinux", "cloudlinux", "rhel"] %} Before=network.service @@ -25,7 +21,6 @@ Conflicts=shutdown.target Before=sysinit.target Conflicts=shutdown.target {% endif %} -RequiresMountsFor=/var/lib/cloud ConditionPathExists=!/etc/cloud/cloud-init.disabled ConditionKernelCommandLine=!cloud-init=disabled ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled diff --git a/systemd/cloud-init-main.service.tmpl b/systemd/cloud-init-main.service.tmpl index 7a9114bb58b..2cabb79b5bf 100644 --- a/systemd/cloud-init-main.service.tmpl +++ b/systemd/cloud-init-main.service.tmpl @@ -8,22 +8,15 @@ # https://www.freedesktop.org/software/systemd/man/latest/systemd-remount-fs.service.html [Unit] Description=Cloud-init: Single Process -Wants=network-pre.target {% if variant in ["almalinux", "cloudlinux", "ubuntu", "unknown", "debian", "rhel"] %} DefaultDependencies=no {% endif %} {% if variant in ["almalinux", "cloudlinux", "rhel"] %} Requires=dbus.socket After=dbus.socket -Before=network.service -Before=firewalld.target -{% endif %} -{% if variant in ["ubuntu", "unknown", "debian"] %} -Before=sysinit.target {% endif %} After=systemd-remount-fs.service -Before=sysinit.target Before=cloud-init-local.service Before=shutdown.target Conflicts=shutdown.target