summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-01-24 16:19:08 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-01-24 16:19:08 -0500
commite2d418287724d25e85d067672049638af022c2c3 (patch)
tree28bf1458c6964bcac9a71029c539e512beafd8db
parentd530222606cf01051daa7fb0508f17bcd27d1d00 (diff)
downloadbcfg2-e2d418287724d25e85d067672049638af022c2c3.tar.gz
bcfg2-e2d418287724d25e85d067672049638af022c2c3.tar.bz2
bcfg2-e2d418287724d25e85d067672049638af022c2c3.zip
implemented something like service removal (#1075)
-rw-r--r--src/lib/Client/Tools/__init__.py7
-rwxr-xr-xsrc/sbin/bcfg22
2 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/Client/Tools/__init__.py b/src/lib/Client/Tools/__init__.py
index 9d0c69892..0c0aa6b8e 100644
--- a/src/lib/Client/Tools/__init__.py
+++ b/src/lib/Client/Tools/__init__.py
@@ -309,6 +309,13 @@ class SvcTool(Tool):
# not supported for this driver
return 0
+ def Remove(self, services):
+ """ Dummy implementation of service removal method """
+ if self.setup['servicemode'] != 'disabled':
+ for entry in services:
+ entry.set("status", "off")
+ self.InstallService(entry)
+
def BundleUpdated(self, bundle, states):
"""The Bundle has been updated."""
if self.setup['servicemode'] == 'disabled':
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 58f2964f9..1d1cc8424 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -109,7 +109,7 @@ class Client:
self.logger.info(Bcfg2.Client.Tools.drivers)
raise SystemExit(0)
if self.setup['remove'] and 'services' in self.setup['remove']:
- self.logger.error("Service removal is nonsensical, disable services to get former behavior")
+ self.logger.error("Service removal is nonsensical; removed services will only be disabled")
if self.setup['remove'] not in [False,
'all',
'Services',