Merge branch 'maint'

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	doc/installation/distributions.txt
	doc/server/snapshots/index.txt
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/sbin/bcfg2-server

1 files changed, 16 insertions, 0 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py
index 473d2bf09..885e22761 100644
--- a/src/lib/Bcfg2/Client/Tools/__init__.py
+++ b/src/lib/Bcfg2/Client/Tools/__init__.py
@@ -510,6 +510,22 @@ class SvcTool(Tool):
         """
         return '/etc/init.d/%s %s' % (service.get('name'), action)
 
+    def get_bootstatus(self, service):
+        """ Return the bootstatus attribute if it exists.
+
+        :param service: The service entry
+        :type service: lxml.etree._Element
+        :returns: string or None - Value of bootstatus if it exists. If
+                  bootstatus is unspecified and status is not *ignore*,
+                  return value of status. If bootstatus is unspecified
+                  and status is *ignore*, return None.
+        """
+        if service.get('bootstatus') is not None:
+            return service.get('bootstatus')
+        elif service.get('status') != 'ignore':
+            return service.get('status')
+        return None
+
     def start_service(self, service):
         """ Start a service.