From 8d3da203029cd235c1289555ac9f9ef8ea4ea0d6 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Tue, 3 Nov 2015 11:43:50 -0500 Subject: [PATCH] fixed bsd service_mgr_facts using removed check_init fucntion --- lib/ansible/module_utils/facts.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/ansible/module_utils/facts.py b/lib/ansible/module_utils/facts.py index ab1a158492..55c89239c3 100644 --- a/lib/ansible/module_utils/facts.py +++ b/lib/ansible/module_utils/facts.py @@ -562,12 +562,8 @@ class Facts(object): else: self.facts['service_mgr'] = 'systemstarter' elif self.facts['system'].endswith('BSD') or self.facts['system'] in ['Bitrig', 'DragonFly']: - proc_1 = check_init() - if proc_1 is not None: - self.facts['service_mgr'] = proc_1 - else: - #FIXME: we might want to break out to individual BSDs - self.facts['service_mgr'] = 'bsdinit' + #FIXME: we might want to break out to individual BSDs + self.facts['service_mgr'] = 'bsdinit' elif self.facts['system'] == 'AIX': self.facts['service_mgr'] = 'src' elif self.facts['system'] == 'SunOS': @@ -701,7 +697,7 @@ class Facts(object): # 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 + # this should show if systemd is the boot init system, if checking 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):