- plugins update

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@780 ef72aa8b-4018-0410-8976-d6e080ef94d8

3 files changed, 24 insertions, 1 deletions

diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py
index e129739b..cf2afbd7 100644
--- a/sos/plugins/cluster.py
+++ b/sos/plugins/cluster.py
@@ -169,6 +169,8 @@ class cluster(sos.plugintools.PluginBase):
                     if len(xpathContext.xpathEval("cluster/rm/resources/fs[@name='%s'][not(@fsid)]" % fsRefName)):
                         self.addDiagnose("one or more nfs export do not have a fsid attribute set.")
                         break
+                    else:
+                        self.addDiagnose("one or more nfs export do not have a fsid attribute set.")
 
         # cluster.conf file version and the in-memory cluster configuration version matches
         status, cluster_version, time = self.callExtProg("cman_tool status | grep 'Config version'")
diff --git a/sos/plugins/libvirt.py b/sos/plugins/libvirt.py
new file mode 100644
index 00000000..07f82a18
--- /dev/null
+++ b/sos/plugins/libvirt.py
@@ -0,0 +1,21 @@
+### This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sos.plugintools
+class libvirt(sos.plugintools.PluginBase):
+    """libvirt-related information
+    """
+    def setup(self):
+        self.addCopySpec("/etc/libvirt/")
+        self.addCopySpec("/var/log/libvirt/")
diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py
index ca4a7577..774952a0 100644
--- a/sos/plugins/rpm.py
+++ b/sos/plugins/rpm.py
@@ -24,7 +24,7 @@ class rpm(sos.plugintools.PluginBase):
         self.addCopySpec("/var/log/rpmpkgs")
 
         if self.getOption("rpmq"):
-            self.collectExtOutput("/bin/rpm -qa --qf=\"%{NAME}-%{VERSION}-%{RELEASE}-%{ARCH}~~%{INSTALLTIME:date}\n\" --nosignature --nodigest|/bin/awk -F ~~ '{printf \"%-60s%s\\n\",$1,$2}'", root_symlink = "installed-rpms")
+            self.collectExtOutput("/bin/rpm -qa --qf=\"%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}~~%{INSTALLTIME:date}\n\" --nosignature --nodigest|/bin/awk -F ~~ '{printf \"%-60s%s\\n\",$1,$2}'", root_symlink = "installed-rpms")
 
         if self.getOption("rpmva"):
             self.collectExtOutput("/bin/rpm -Va", root_symlink = "rpm-Va", timeout = 3600)