Simplify service configuration; make all services use common restart framework

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5040 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 2 insertions, 18 deletions

diff --git a/src/lib/Client/Tools/FreeBSDInit.py b/src/lib/Client/Tools/FreeBSDInit.py
index 4f5131fb5..5837cff37 100644
--- a/src/lib/Client/Tools/FreeBSDInit.py
+++ b/src/lib/Client/Tools/FreeBSDInit.py
@@ -12,25 +12,9 @@ class FreeBSDInit(Bcfg2.Client.Tools.SvcTool):
     name = 'FreeBSDInit'
     __handles__ = [('Service', 'freebsd')]
     __req__ = {'Service': ['name', 'status']}
-    __svcrestart__ = 'restart'
 
     def VerifyService(self, entry, _):
         return True
 
-    def BundleUpdated(self, bundle, states):
-        '''The Bundle has been updated'''
-        for entry in bundle:
-            if self.handlesEntry(entry):
-                command = "/usr/local/etc/rc.d/%s" % entry.get('name')
-                if entry.get('status') == 'on' and not self.setup['build']:
-                    self.logger.debug('Restarting service %s' % \
-                                      entry.get('name'))
-                    rc = self.cmd.run('%s %s' % (command, \
-                        entry.get('reload', self.__svcrestart__)))[0]
-                else:
-                    self.logger.debug('Stopping service %s' % entry.get('name'))
-                    rc = self.cmd.run('%s stop' %  command)[0]
-                if rc:
-                    self.logger.error("Failed to restart service %s" % \
-                                     (entry.get('name')))
-
+    def get_svc_command(self, service, action):
+        return "/usr/local/etc/rc.d/%s %s" % (service.get('name'), action)