Return correct value for services that must be enabled in Systemd #31677
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Go Go Jenkins! |
|
Hi @miihael - You have a small lint error. Would you mind cleaning that up? |
rallytime
added
the
pending-changes
…t in SysV
This fixes situations, when a server switched from SysV to Systemd.
SysV symlinks are still in place and Salt incorrectly determines, that
service is already enabled.
For example:
~$ salt-call --local service.enabled spamassassin
[INFO ] Executing command 'systemctl is-enabled spamassassin.service'
[INFO ] Executing command 'runlevel' in directory '/root'
local:
True
However:
~$ systemctl is-enabled spamassassin.service
disabled
~$ find /etc/rc*.d/ -name
'*spamassassin'
/etc/rc0.d/K02spamassassin
/etc/rc1.d/K02spamassassin
/etc/rc2.d/S02spamassassin
/etc/rc3.d/S02spamassassin
/etc/rc4.d/S02spamassassin
/etc/rc5.d/S02spamassassin
/etc/rc6.d/K02spamassassin
I fixed it, thank you! |
rallytime
removed
the
pending-changes
|
Thanks! |
rallytime
pushed a commit
that referenced
this pull request
Mar 6, 2016
Return correct value for services that must be enabled in Systemd
|
@rallytime can we get this backported to 2016.3? This will fix issue #34267 |
Ch3LL
added
the
bugfix-bckport
rallytime
added
ZZZ[Done]-back-ported-bf
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Fix incorrect return value for service.enabled
Previous Behavior
True is returned when the Systemd-based service is disabled in Systemd
but enabled in SysV
New Behavior
True is returned only when the Systemd-based service is enabled in Systemd
Tests written?
This fixes situations, when a server is switched from SysV to Systemd.
SysV symlinks are still in place and Salt incorrectly determines, that
service is enabled.
For example:
However: