From b502b9f51b4d314ed6fa76d66a6db8aea7d32c12 Mon Sep 17 00:00:00 2001
From: Pavel Moravec <pmoravec@redhat.com>
Date: Sun, 31 May 2015 16:00:16 +0200
Subject: [startup] rename plugin to 'services'

The plugin is supposed to collect information about services
rather than about their startup.

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
---
 sos/plugins/services.py | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
 sos/plugins/startup.py  | 56 -------------------------------------------------
 2 files changed, 56 insertions(+), 56 deletions(-)
 create mode 100644 sos/plugins/services.py
 delete mode 100644 sos/plugins/startup.py

diff --git a/sos/plugins/services.py b/sos/plugins/services.py
new file mode 100644
index 00000000..606a1351
--- /dev/null
+++ b/sos/plugins/services.py
@@ -0,0 +1,56 @@
+# 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 Services(Plugin):
+    """System services
+    """
+
+    plugin_name = "services"
+    profiles = ('system', 'boot')
+
+    option_list = [("servicestatus", "get a status of all running services",
+                    "slow", False)]
+
+    def setup(self):
+        self.add_copy_spec([
+            "/etc/inittab",
+            "/etc/rc.d"
+        ])
+        if self.get_option('servicestatus'):
+            self.add_cmd_output("/sbin/service --status-all")
+        self.add_cmd_output("/sbin/runlevel")
+
+
+class RedHatServices(Services, RedHatPlugin):
+
+    def setup(self):
+        super(RedHatServices, self).setup()
+        self.add_cmd_output("/sbin/chkconfig --list", root_symlink="chkconfig")
+
+
+class DebianServices(Services, DebianPlugin, UbuntuPlugin):
+
+    def setup(self):
+        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/startup.py b/sos/plugins/startup.py
deleted file mode 100644
index 9d923702..00000000
--- a/sos/plugins/startup.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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 Startup(Plugin):
-    """System startup
-    """
-
-    plugin_name = "startup"
-    profiles = ('system', 'boot')
-
-    option_list = [("servicestatus", "get a status of all running services",
-                    "slow", False)]
-
-    def setup(self):
-        self.add_copy_spec([
-            "/etc/inittab",
-            "/etc/rc.d"
-        ])
-        if self.get_option('servicestatus'):
-            self.add_cmd_output("/sbin/service --status-all")
-        self.add_cmd_output("/sbin/runlevel")
-
-
-class RedHatStartup(Startup, RedHatPlugin):
-
-    def setup(self):
-        super(RedHatStartup, self).setup()
-        self.add_cmd_output("/sbin/chkconfig --list", root_symlink="chkconfig")
-
-
-class DebianStartup(Startup, DebianPlugin, UbuntuPlugin):
-
-    def setup(self):
-        super(DebianStartup, 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 :
-- 
cgit