Skip to content

Commit

Permalink
chore: simplify Conflicts=shutdown.target (canonical#5830)
Browse files Browse the repository at this point in the history
This is required by all distros which use DefaultDependencies=no.
It implicitly added by all distros which do not use DefaultDependencies=no.
Therefore, it does no harm to apply it in all cases.
  • Loading branch information
holmanb committed Oct 22, 2024
1 parent 892e196 commit a300fee
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions systemd/cloud-init-local.service.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ Before=network-pre.target
Before=shutdown.target
{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
Before=firewalld.target
Conflicts=shutdown.target
{% endif %}
{% if variant in ["ubuntu", "unknown", "debian"] %}
Before=sysinit.target
Conflicts=shutdown.target
{% endif %}
Conflicts=shutdown.target
ConditionPathExists=!/etc/cloud/cloud-init.disabled
ConditionKernelCommandLine=!cloud-init=disabled
ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
Expand Down

0 comments on commit a300fee

Please sign in to comment.