ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

check_systemd is not inline but a private fact function now

Browse source
This commit is contained in:
Brian Coca 2015-11-02 15:23:23 -05:00
parent e9efd008ed
commit d194e2c788
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/module_utils/facts.py
View file

@ -575,19 +575,7 @@ class Facts(object):
self.facts['service_mgr'] = 'svcs' self.facts['service_mgr'] = 'svcs'
elif self.facts['system'] == 'Linux': elif self.facts['system'] == 'Linux':
def check_systemd(module): if self._check_systemd(module):
# tools must be installed
if module.get_bin_path('systemctl'):
# this should show if systemd is the boot init system, if check_init faild to mark as systemd
# these mirror systemd's own sd_boot test http://www.freedesktop.org/software/systemd/man/sd_booted.html
for canary in ["/run/systemd/system/", "/dev/.run/systemd/", "/dev/.systemd/"]:
if os.path.exists(canary):
return True
return False
if check_systemd(module):
self.facts['service_mgr'] = 'systemd' self.facts['service_mgr'] = 'systemd'
elif module.get_bin_path('initctl') and os.path.exists("/etc/init/"): elif module.get_bin_path('initctl') and os.path.exists("/etc/init/"):
self.facts['service_mgr'] = 'upstart' self.facts['service_mgr'] = 'upstart'
@ -709,6 +697,16 @@ class Facts(object):
self.facts['date_time']['tz'] = time.strftime("%Z") self.facts['date_time']['tz'] = time.strftime("%Z")
self.facts['date_time']['tz_offset'] = time.strftime("%z") self.facts['date_time']['tz_offset'] = time.strftime("%z")
def _check_systemd(self):
# tools must be installed
if module.get_bin_path('systemctl'):
# this should show if systemd is the boot init system, if check_init faild to mark as systemd
# these mirror systemd's own sd_boot test http://www.freedesktop.org/software/systemd/man/sd_booted.html
for canary in ["/run/systemd/system/", "/dev/.run/systemd/", "/dev/.systemd/"]:
if os.path.exists(canary):
return True
return False
# User # User
def get_user_facts(self): def get_user_facts(self):