Merge pull request #2341 from reactormonk/devel

simpler way to check if systemd is the init system

system/service.py

@@ -403,22 +403,7 @@ class LinuxService(Service):
                 self.svc_initscript = initscript
 
         def check_systemd():
-            # verify systemd is installed (by finding systemctl)
+            return os.path.exists("/run/systemd/system/") or os.path.exists("/dev/.run/systemd/") or os.path.exists("/dev/.systemd/")
-            if not location.get('systemctl', False):
-                return False
-
-            # Check if init is the systemd command, using comm as cmdline could be symlink
-            try:
-                f = open('/proc/1/comm', 'r')
-            except IOError, err:
-                # If comm doesn't exist, old kernel, no systemd
-                return False
-
-            for line in f:
-                if 'systemd' in line:
-                    return True
-
-            return False
 
         # Locate a tool to enable/disable a service
         if location.get('systemctl',False) and check_systemd():