aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Hunsaker <jhunsake@redhat.com>2020-07-20 09:32:07 -0400
committerJake Hunsaker <jhunsake@redhat.com>2020-07-21 10:01:01 -0400
commitf9cc0df78991228de8fd23e18bc7d28ff7235ef9 (patch)
tree1401c3ee14a9c5b73b6c176f4f09db365443f60f
parentc78c7c1852f89f1ebe63390f1e1c55dfea9ddcdb (diff)
downloadsos-f9cc0df78991228de8fd23e18bc7d28ff7235ef9.tar.gz
[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 <jhunsake@redhat.com>
-rw-r--r--sos/report/plugins/sos_extras.py6
1 files 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)