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.

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

Don't load service.py if minion is running a non-sysvinit init system #48955

Merged
merged 1 commit into from Aug 6, 2018

Conversation

Projects
None yet
3 participants
@terminalmage
Member

terminalmage commented Aug 6, 2018

This keeps service.py from overriding systemd.py, among others.

Note that this PR also cleans up the OSes from the disable list that were there simply because they ran a different init system. In the future we should also modify the __virtual__ func such that we don't have to keep a list of OSes which are Debian/Ubuntu/RHEL derivatives at all.

Don't load service.py if minion is running a non-sysvinit init system
This keeps service.py from overriding systemd.py, among others.

@rallytime rallytime merged commit 0245cff into saltstack:2017.7 Aug 6, 2018

7 of 8 checks passed

jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details

@terminalmage terminalmage deleted the terminalmage:service-systemd branch Aug 6, 2018

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