diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2007-01-08 17:00:02 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2007-01-08 17:00:02 +0000 |
| commit | 3813b4e6553548423916f97cc5728b09a361869c (patch) | |
| tree | 6d3411903b41b2bfb7a6283486f8391ee185658f /src/lib/Client/Tools | |
| parent | e931950c5a26e823ac0a8c186617b9fa68e22843 (diff) | |
| download | bcfg2-3813b4e6553548423916f97cc5728b09a361869c.tar.gz bcfg2-3813b4e6553548423916f97cc5728b09a361869c.tar.bz2 bcfg2-3813b4e6553548423916f97cc5728b09a361869c.zip | |
Two fixes for SMF FMRI verification
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2628 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Client/Tools')
| -rw-r--r-- | src/lib/Client/Tools/SMF.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Client/Tools/SMF.py b/src/lib/Client/Tools/SMF.py index ce4d8261d..0dae28356 100644 --- a/src/lib/Client/Tools/SMF.py +++ b/src/lib/Client/Tools/SMF.py @@ -23,6 +23,7 @@ class SMF(Bcfg2.Client.Tools.Tool): else: self.logger.info('Failed to locate FMRI for service %s' % entry.get('name')) return False + return True def VerifyService(self, entry, _): '''Verify SMF Service Entry''' @@ -42,7 +43,7 @@ class SMF(Bcfg2.Client.Tools.Tool): self.logger.debug("No service matching %s" % (entry.get("FMRI"))) return entry.get('status') == 'off' try: - srvdata = self.cmd.run("/usr/bin/svcs -H -o STA %s" % entry.get('name'))[1][0].split() + srvdata = self.cmd.run("/usr/bin/svcs -H -o STA %s" % entry.get('FMRI'))[1][0].split() except IndexError: # Ocurrs when no lines are returned (service not installed) return False |