From f9cc0df78991228de8fd23e18bc7d28ff7235ef9 Mon Sep 17 00:00:00 2001 From: Jake Hunsaker Date: Mon, 20 Jul 2020 09:32:07 -0400 Subject: [sos_extras] Update extras directory path Updates the `sos_extras` plugin to use `/etc/sos/extras.d/` now instead of /etc/sos.extras.d plugin to use `/etc/sos/extras.d/` now instead of `/etc/sos.extras.d/` Signed-off-by: Jake Hunsaker --- sos/report/plugins/sos_extras.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sos/report/plugins/sos_extras.py b/sos/report/plugins/sos_extras.py index 8a7a6cdc..b44176f0 100644 --- a/sos/report/plugins/sos_extras.py +++ b/sos/report/plugins/sos_extras.py @@ -13,7 +13,7 @@ import stat class SosExtras(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): - short_desc = 'Collect extra data defined in /etc/sos.extras.d' + short_desc = 'Collect extra data defined in /etc/sos/extras.d' """The plugin traverses 'extras_dir' directory and for each file there, it executes commands or collects files optionally with sizelimit. Expected @@ -39,7 +39,7 @@ class SosExtras(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): plugin_name = "sos_extras" - extras_dir = '/etc/sos.extras.d/' + extras_dir = '/etc/sos/extras.d/' files = (extras_dir) @@ -56,8 +56,6 @@ class SosExtras(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): self.extras_dir) return - self.add_copy_spec(self.extras_dir) - for path, dirlist, filelist in os.walk(self.extras_dir): for f in filelist: _file = os.path.join(path, f) -- cgit