Merge pull request #2341 from reactormonk/devel

simpler way to check if systemd is the init system
This commit is contained in:
Brian Coca 2015-10-23 18:44:01 -04:00
commit dae3718e79

View file

@ -403,22 +403,7 @@ class LinuxService(Service):
self.svc_initscript = initscript
def check_systemd():
# verify systemd is installed (by finding systemctl)
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
return os.path.exists("/run/systemd/system/") or os.path.exists("/dev/.run/systemd/") or os.path.exists("/dev/.systemd/")
# Locate a tool to enable/disable a service
if location.get('systemctl',False) and check_systemd():