summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2014-03-25 14:14:25 -0500
committerSol Jerome <sol.jerome@gmail.com>2014-04-06 18:48:20 -0500
commitbb873c4ab0848bc820db445938d4ff530173a062 (patch)
tree28f25925108db154eb861849684077b64cab96fa
parent20e9e120c8f565bd31a301b56b85a7652afa1358 (diff)
downloadbcfg2-bb873c4ab0848bc820db445938d4ff530173a062.tar.gz
bcfg2-bb873c4ab0848bc820db445938d4ff530173a062.tar.bz2
bcfg2-bb873c4ab0848bc820db445938d4ff530173a062.zip
Revert "Systemd: systemd is a replacement for chkconfig"
This reverts commit 690a18b5bb61516e5c11f6da3d788332373c196b. While systemd is meant to replace chkconfig, it appears that RHEL7 has both and does not provide systemd alternatives for certain SYSV init scripts by default.
-rw-r--r--src/lib/Bcfg2/Client/Tools/Systemd.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Systemd.py b/src/lib/Bcfg2/Client/Tools/Systemd.py
index 20a172d3d..027d91c71 100644
--- a/src/lib/Bcfg2/Client/Tools/Systemd.py
+++ b/src/lib/Bcfg2/Client/Tools/Systemd.py
@@ -13,8 +13,6 @@ class Systemd(Bcfg2.Client.Tools.SvcTool):
__handles__ = [('Service', 'systemd')]
__req__ = {'Service': ['name', 'status']}
- conflicts = ['Chkconfig']
-
def get_svc_command(self, service, action):
return "/bin/systemctl %s %s.service" % (action, service.get('name'))