x/cloud-init
Code Issues Proposed changes

Make systemd root installation dir appropriate for debian-like systems, else fallback to universally acceptable one.

Browse Source
This commit is contained in:
Dimitri John Ledkov
2014-07-23 14:54:14 +01:00
parent aeca294990
commit c495290e5e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
setup.py
View File

@@ -35,6 +35,10 @@ import subprocess
def is_f(p): def is_f(p):
return os.path.isfile(p) return os.path.isfile(p)
if is_f('/etc/debian_version'):
systemd_root = '/lib/systemd/system/'
else:
systemd_root = '/etc/systemd/system/'
INITSYS_FILES = { INITSYS_FILES = {
'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)], 'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)],
@@ -45,7 +49,7 @@ INITSYS_FILES = {
INITSYS_ROOTS = { INITSYS_ROOTS = {
'sysvinit': '/etc/rc.d/init.d', 'sysvinit': '/etc/rc.d/init.d',
'sysvinit_deb': '/etc/init.d', 'sysvinit_deb': '/etc/init.d',
'systemd': '/etc/systemd/system/', 'systemd': systemd_root,
'upstart': '/etc/init/', 'upstart': '/etc/init/',
} }
INITSYS_TYPES = sorted(list(INITSYS_ROOTS.keys())) INITSYS_TYPES = sorted(list(INITSYS_ROOTS.keys()))