From 82ec224a9372a45a98370f2ef280dbe99e12c66c Mon Sep 17 00:00:00 2001
From: Eri Bastos <eri.bastos@corp.eastlink.ca>
Date: Fri, 13 Jun 2014 15:06:10 -0300
Subject: [PATCH 1/2] Proposed fix for issue #7757

---
 library/system/service | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/system/service b/library/system/service
index 636039c9ce7..c2bbb332c99 100644
--- a/library/system/service
+++ b/library/system/service
@@ -576,7 +576,7 @@ class LinuxService(Service):
                 override_file.close()
 
             initpath = '/etc/init'
-            manreg = re.compile('^manual\s*$', re.M | re.I)
+            manreg = re.compile('^start on manual\s*$', re.M | re.I)
             conf_file_name = "%s/%s.conf" % (initpath, self.name)
             override_file_name = "%s/%s.override" % (initpath, self.name)
 
@@ -591,12 +591,12 @@ class LinuxService(Service):
                     write_to_override_file(override_file_name, manreg.sub('', override_file_contents))
                 # Add manual stanza if not present and service disabled
                 elif not (self.enable) and not (manreg.search(override_file_contents)):
-                    write_to_override_file(override_file_name, override_file_contents + '\nmanual\n')
+                    write_to_override_file(override_file_name, override_file_contents + '\nstart on manual\n')
                 else:
                     return
             # Add file with manual stanza if service disabled
             elif not (self.enable):
-                write_to_override_file(override_file_name, 'manual\n')
+                write_to_override_file(override_file_name, 'start on manual\n')
             else:
                 return
 

From d6a8d4671af582efe28423cf549c21f37955fa20 Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Mon, 25 Aug 2014 13:41:39 -0500
Subject: [PATCH 2/2] Add additional checks to detect upstart services

Also adds checks for the upstart version, in order to test check
support for manual vs. start on manual
---
 library/system/service | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/library/system/service b/library/system/service
index c2bbb332c99..c9544c53567 100644
--- a/library/system/service
+++ b/library/system/service
@@ -105,6 +105,8 @@ import select
 import time
 import string
 
+from distutils.version import LooseVersion
+
 class Service(object):
     """
     This is the generic Service manipulation class that is subclassed
@@ -449,6 +451,26 @@ class LinuxService(Service):
         elif check_systemd(self.name):
             # service is managed by systemd
             self.enable_cmd = location['systemctl']
+        elif location['initctl'] and os.path.exists("/etc/init/%s.conf" % self.name):
+            # service is managed by upstart
+            self.enable_cmd = location['initctl']
+
+        # if this service is managed via upstart, get the current upstart version
+        if self.enable_cmd == location['initctl']:
+            # default the upstart version to something we can compare against
+            self.upstart_version = LooseVersion('0.0.0')
+            try:
+                # set the upstart version based on the output of 'initctl version'
+                version_re = re.compile(r'\(upstart (.*)\)')
+                rc,stdout,stderr = self.module.run_command('initctl version')
+                if rc == 0:
+                    res = version_re.search(stdout)
+                    if res:
+                        self.upstart_version = LooseVersion(res.groups()[0])
+            except:
+                # we'll use the default of 0.0.0 since we couldn't
+                # detect the current upstart version above
+                pass
 
         # Locate a tool for runtime service management (start, stop etc.)
         if location.get('service', None) and os.path.exists("/etc/init.d/%s" % self.name):
@@ -576,7 +598,12 @@ class LinuxService(Service):
                 override_file.close()
 
             initpath = '/etc/init'
-            manreg = re.compile('^start on manual\s*$', re.M | re.I)
+            if self.upstart_version >= LooseVersion('0.6.7'):
+                manreg = re.compile('^manual\s*$', re.M | re.I)
+                config_line = 'manual\n'
+            else:
+                manreg = re.compile('^start on manual\s*$', re.M | re.I)
+                config_line = 'start on manual\n'
             conf_file_name = "%s/%s.conf" % (initpath, self.name)
             override_file_name = "%s/%s.override" % (initpath, self.name)
 
@@ -591,12 +618,12 @@ class LinuxService(Service):
                     write_to_override_file(override_file_name, manreg.sub('', override_file_contents))
                 # Add manual stanza if not present and service disabled
                 elif not (self.enable) and not (manreg.search(override_file_contents)):
-                    write_to_override_file(override_file_name, override_file_contents + '\nstart on manual\n')
+                    write_to_override_file(override_file_name, override_file_contents + '\n' + config_line)
                 else:
                     return
             # Add file with manual stanza if service disabled
             elif not (self.enable):
-                write_to_override_file(override_file_name, 'start on manual\n')
+                write_to_override_file(override_file_name, config_line)
             else:
                 return