diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2014-08-05 17:53:43 +0100 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2014-08-05 17:53:43 +0100 |
| commit | 2f99d91b5201b00a36575e3720174ef533f401c8 (patch) | |
| tree | 694822b6557a07608961bdf75f9707bdeefa813c | |
| parent | c108de69b6f705672776031319100c6716ad3c26 (diff) | |
| download | sos-2f99d91b5201b00a36575e3720174ef533f401c8.tar.gz | |
[general,upstart] move upstart specifics to Upstart plugin
Related: #69.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/general.py | 2 | ||||
| -rw-r--r-- | sos/plugins/upstart.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sos/plugins/general.py b/sos/plugins/general.py index 9b6e5f85..c225abcf 100644 --- a/sos/plugins/general.py +++ b/sos/plugins/general.py @@ -22,8 +22,6 @@ class General(Plugin): def setup(self): self.add_copy_specs([ - "/etc/event.d", - "/etc/inittab", "/etc/sos.conf", "/etc/sysconfig", "/proc/stat", diff --git a/sos/plugins/upstart.py b/sos/plugins/upstart.py index 721cc297..f946b853 100644 --- a/sos/plugins/upstart.py +++ b/sos/plugins/upstart.py @@ -35,7 +35,8 @@ class Upstart(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): # Job Configuration Files self.add_copy_specs([ '/etc/init.conf', - '/etc/init/' + '/etc/event.d/*', + '/etc/init/*.conf' ]) # State file |