opendev
/
glean
Code Issues Proposed changes

Merge "Revise systemd determination to verify systemctl presence"

This commit is contained in:
Jenkins 2017-06-17 14:38:23 +00:00 committed by Gerrit Code Review
parent 3bc6216828 3c5d0221ff
commit d09a654595
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glean/install.py
View File

@ -96,7 +96,16 @@ def main():
log.info('installing openrc services')
install('glean.openrc', '/etc/init.d/glean')
subprocess.call(['rc-update', 'add', 'glean', 'boot'])
if os.path.exists('/usr/lib/systemd'):
# Needs to check for the presence of systemd and systemctl
# as apparently some packages may stage systemd init files
# when systemd is not present.
# We also cannot check the path for the init pid as the pid
# may be wrong as install is generally executed in a chroot
# with diskimage-builder.
if (os.path.exists('/usr/lib/systemd/system') and
(os.path.exists('/usr/bin/systemctl') or
os.path.exists('/bin/systemctl'))):
p = _find_gleansh_path()
log.info("Installing systemd services")