From e2d418287724d25e85d067672049638af022c2c3 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 24 Jan 2012 16:19:08 -0500 Subject: implemented something like service removal (#1075) --- src/lib/Client/Tools/__init__.py | 7 +++++++ src/sbin/bcfg2 | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) 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', -- cgit v1.2.3-1-g7c22