diff options
| -rw-r--r-- | sos/plugins/services.py | 7 | ||||
| -rw-r--r-- | sos/plugins/upstart.py | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sos/plugins/services.py b/sos/plugins/services.py index 372e4342..56e0fce0 100644 --- a/sos/plugins/services.py +++ b/sos/plugins/services.py @@ -26,7 +26,7 @@ class Services(Plugin): "/etc/rc.local" ]) if self.get_option('servicestatus'): - self.add_cmd_output("/sbin/service --status-all") + self.add_cmd_output("service --status-all") self.add_cmd_output([ "/sbin/runlevel", "ls /var/lock/subsys" @@ -46,9 +46,4 @@ class DebianServices(Services, DebianPlugin, UbuntuPlugin): super(DebianServices, self).setup() self.add_copy_spec("/etc/rc*.d") - self.add_cmd_output("/sbin/initctl show-config", - root_symlink="initctl") - if self.get_option('servicestatus'): - self.add_cmd_output("/sbin/initctl list") - # vim: set et ts=4 sw=4 : diff --git a/sos/plugins/upstart.py b/sos/plugins/upstart.py index 7d050a63..ff81d49d 100644 --- a/sos/plugins/upstart.py +++ b/sos/plugins/upstart.py @@ -24,7 +24,8 @@ class Upstart(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): 'initctl --system list', 'initctl --system version', 'init --version', - "ls -l /etc/init/" + "ls -l /etc/init/", + 'initctl show-config' ]) # Job Configuration Files |