New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify systemd service files #5830

Merged

holmanb merged 5 commits into canonical:main from holmanb:holmanb/systemd-cleanup

Oct 18, 2024

Member

holmanb commented Oct 18, 2024 •

edited

Loading

Additional Context

Merge type

Squash merge using "Proposed Commit Message"
Rebase and merge unique commits. Requires commit messages per-commit each referencing the pull request number (#<PR_NUM>)

TheRealFalcon approved these changes

View reviewed changes

Member

TheRealFalcon left a comment

LGTM!

holmanb added 5 commits

October 18, 2024 14:48


          chore: remove unnecessary systemd settings (canonical#5830)

a7bf1f8

- RHEL family distros use ds-identify, and therefore the run directory is
  already made and ds-identify will have created the enabled file.
- network.service doesn't appear to ever have been used, and was probably
  intended to be network.target.


          chore: remove redundant Before=NetworkManager.service (canonical#5830)

8acdb6e

This service is also Before=network-pre.target.
NetworkManager.service is ordered After=network-pre.target
Therefore, this setting is redundant.


          chore: simplify Conflicts=shutdown.target (canonical#5830)

5ccaff8

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.


          chore: simplify and standardize cloud-final.service (canonical#5830)

245f946

- There is no harm in ordering after a service which doesn't exist.
- Cloud-init's final stage should consistently be ordered with respect to
  multi-user.target on all distros.


          chore: don't render non-templated unit files (canonical#5830)

aba3f71

holmanb force-pushed the holmanb/systemd-cleanup branch from 2b9c509 to aba3f71 Compare

October 18, 2024 20:50

holmanb merged commit d1d7af6 into canonical:main

21 of 22 checks passed

holmanb added a commit that referenced this pull request


          chore: remove unnecessary systemd settings (#5830)

9bb0a88

- RHEL family distros use ds-identify, and therefore the run directory is
  already made and ds-identify will have created the enabled file.
- network.service doesn't appear to ever have been used, and was probably
  intended to be network.target.

holmanb added a commit that referenced this pull request


          chore: remove redundant Before=NetworkManager.service (#5830)

069efee

This service is also Before=network-pre.target.
NetworkManager.service is ordered After=network-pre.target
Therefore, this setting is redundant.

holmanb added a commit that referenced this pull request


          chore: simplify Conflicts=shutdown.target (#5830)

cb0c08d

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.

holmanb added a commit that referenced this pull request


          chore: simplify and standardize cloud-final.service (#5830)

be88242

- There is no harm in ordering after a service which doesn't exist.
- Cloud-init's final stage should consistently be ordered with respect to
  multi-user.target on all distros.

holmanb added a commit to holmanb/cloud-init that referenced this pull request


          chore: remove unnecessary systemd settings (canonical#5830)

e72bab9

- RHEL family distros use ds-identify, and therefore the run directory is
  already made and ds-identify will have created the enabled file.
- network.service doesn't appear to ever have been used, and was probably
  intended to be network.target.

holmanb added a commit to holmanb/cloud-init that referenced this pull request


          chore: remove redundant Before=NetworkManager.service (canonical#5830)

892e196

This service is also Before=network-pre.target.
NetworkManager.service is ordered After=network-pre.target
Therefore, this setting is redundant.

holmanb added a commit to holmanb/cloud-init that referenced this pull request


          chore: simplify Conflicts=shutdown.target (canonical#5830)

a300fee

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.

holmanb added a commit to holmanb/cloud-init that referenced this pull request


          chore: simplify and standardize cloud-final.service (canonical#5830)

39260b0

- There is no harm in ordering after a service which doesn't exist.
- Cloud-init's final stage should consistently be ordered with respect to
  multi-user.target on all distros.

holmanb added a commit to holmanb/cloud-init that referenced this pull request


          chore: don't render non-templated unit files (canonical#5830)

076d63b

TheRealFalcon pushed a commit that referenced this pull request


          chore: remove unnecessary systemd settings (#5830)

f408d00

- RHEL family distros use ds-identify, and therefore the run directory is
  already made and ds-identify will have created the enabled file.
- network.service doesn't appear to ever have been used, and was probably
  intended to be network.target.

TheRealFalcon pushed a commit that referenced this pull request


          chore: remove redundant Before=NetworkManager.service (#5830)

8d47ea5

This service is also Before=network-pre.target.
NetworkManager.service is ordered After=network-pre.target
Therefore, this setting is redundant.

TheRealFalcon pushed a commit that referenced this pull request


          chore: simplify Conflicts=shutdown.target (#5830)

8f063fd

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.

TheRealFalcon pushed a commit that referenced this pull request


          chore: simplify and standardize cloud-final.service (#5830)

4482fc4

- There is no harm in ordering after a service which doesn't exist.
- Cloud-init's final stage should consistently be ordered with respect to
  multi-user.target on all distros.

TheRealFalcon pushed a commit that referenced this pull request


          chore: don't render non-templated unit files (#5830)

483bd2f

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet