aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8>2010-11-22 13:23:29 +0000
committerpcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8>2010-11-22 13:23:29 +0000
commit9fbfb0619df94ca762e4abf3cb88f069428b83c6 (patch)
tree1fef622b9f56074cb3cf6bc9c4ac46154ec5f82a
parentf5e54793870ab278d835be05cc1d69ddaa48fbee (diff)
downloadsos-9fbfb0619df94ca762e4abf3cb88f069428b83c6.tar.gz
Adding the dbus machine ID, kernel boot ID
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@1015 ef72aa8b-4018-0410-8976-d6e080ef94d8
-rw-r--r--sos/plugins/general.py1
-rw-r--r--sos/plugins/kernel.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/sos/plugins/general.py b/sos/plugins/general.py
index 1b80eebc..7c5b1d30 100644
--- a/sos/plugins/general.py
+++ b/sos/plugins/general.py
@@ -42,6 +42,7 @@ class general(sos.plugintools.PluginBase):
self.addCopySpec("/var/log/up2date")
self.collectExtOutput("/usr/bin/hostid")
self.addCopySpec("/etc/hostid")
+ self.addCopySpec("/var/lib/dbus/machine-id")
self.addCopySpec("/etc/exports")
self.collectExtOutput("/bin/hostname", root_symlink = "hostname")
self.collectExtOutput("/bin/date", root_symlink = "date")
diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py
index 05909ca7..25af8b98 100644
--- a/sos/plugins/kernel.py
+++ b/sos/plugins/kernel.py
@@ -56,6 +56,7 @@ class kernel(sos.plugintools.PluginBase):
self.collectExtOutput("/sbin/sysctl -a")
if os.path.isfile("/sbin/ksyms"):
self.collectExtOutput("/sbin/ksyms")
+ self.addCopySpec("/proc/sys/kernel/random/boot_id")
self.addCopySpec("/sys/module/*/parameters")
self.addCopySpec("/proc/filesystems")
self.addCopySpec("/proc/ksyms")