diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2007-01-08 17:18:13 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2007-01-08 17:18:13 +0000 |
commit | 186a18e40c8b51445b6f7d7ce290c3a38f03be57 (patch) | |
tree | 582d0f59f6632f26f089e637cf6001fee0e22bb2 /src/lib | |
parent | 3813b4e6553548423916f97cc5728b09a361869c (diff) | |
download | bcfg2-186a18e40c8b51445b6f7d7ce290c3a38f03be57.tar.gz bcfg2-186a18e40c8b51445b6f7d7ce290c3a38f03be57.tar.bz2 bcfg2-186a18e40c8b51445b6f7d7ce290c3a38f03be57.zip |
Fix DebInit and SMF extra service removal
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2629 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Client/Tools/DebInit.py | 7 | ||||
-rw-r--r-- | src/lib/Client/Tools/SMF.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/Client/Tools/DebInit.py b/src/lib/Client/Tools/DebInit.py index 892b8edb4..c1fbffad6 100644 --- a/src/lib/Client/Tools/DebInit.py +++ b/src/lib/Client/Tools/DebInit.py @@ -62,7 +62,6 @@ class DebInit(Bcfg2.Client.Tools.SvcTool): def Remove(self, entries): '''Remove extra service entries''' - self.logger.info('Removing services:') - self.logger.info([entry.get('name') for entry in entries]) - for entry in entries: - self.cmd.run("rm -f /etc/rc*.d/S??%s" % (entry.get('name'))) + # Extra service removal is nonsensical + # Extra services need to be reflected in the config + return diff --git a/src/lib/Client/Tools/SMF.py b/src/lib/Client/Tools/SMF.py index 0dae28356..57d1ea8f7 100644 --- a/src/lib/Client/Tools/SMF.py +++ b/src/lib/Client/Tools/SMF.py @@ -90,6 +90,8 @@ class SMF(Bcfg2.Client.Tools.Tool): def Remove(self, svcs): '''Remove Extra SMF entries''' + # Extra service entry removal is nonsensical + # Extra service entries should be reflected in config, even if disabled pass def FindExtra(self): |