From 7cf679f38371c0bf1e44acb542226ebc68b4c432 Mon Sep 17 00:00:00 2001 From: Adam Stokes Date: Fri, 22 Aug 2014 17:04:46 -0400 Subject: [dbus] new dbus plugin Adds dbus plugin support for Fedora, Debian, and Ubuntu. Also pulls the `/var/lib/dbus/machine-id` out of general into this plugin. Fixes #350 Signed-off-by: Adam Stokes --- sos/plugins/dbus.py | 30 ++++++++++++++++++++++++++++++ sos/plugins/general.py | 1 - 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 sos/plugins/dbus.py diff --git a/sos/plugins/dbus.py b/sos/plugins/dbus.py new file mode 100644 index 00000000..3e888870 --- /dev/null +++ b/sos/plugins/dbus.py @@ -0,0 +1,30 @@ +# 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. + +from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin + + +class Dbus(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): + """dbus information""" + + plugin_name = "dbus" + + def setup(self): + self.add_copy_specs([ + "/etc/dbus-1", + "/var/lib/dbus/machine-id" + ]) + + +# vim: et ts=4 sw=4 diff --git a/sos/plugins/general.py b/sos/plugins/general.py index 7de9aa7b..0a78074c 100644 --- a/sos/plugins/general.py +++ b/sos/plugins/general.py @@ -27,7 +27,6 @@ class General(Plugin): "/proc/stat", "/var/log/pm/suspend.log", "/etc/hostid", - "/var/lib/dbus/machine-id", "/etc/localtime", "/etc/os-release" ]) -- cgit