Merge remote-tracking branch 'gh/jewel'

This commit is contained in:
Sage Weil 2016-03-09 15:45:38 -05:00
commit cec8f23b6a

View File

@ -8,10 +8,6 @@ def choose_init():
Returns the name of a init system (upstart, sysvinit ...). Returns the name of a init system (upstart, sysvinit ...).
""" """
init_mapping = { if release and int(release.split('.')[0]) >= 12:
'11': 'sysvinit', # SLE_11 return 'systemd'
'12': 'systemd', # SLE_12 return 'sysvinit'
'13.1': 'systemd', # openSUSE_13.1
'13.2': 'systemd', # openSUSE_13.2
}
return init_mapping.get(release, 'sysvinit')