PORTREVISION?=	1

EXTRA_PATCHES=	${FILESDIR}/extra-patch-872594b

From 872594b49a69a1f3795e0de3f7cf0194b6bdfd53 Mon Sep 17 00:00:00 2001

From: Michael Scherer <misc@redhat.com>

Date: Sun, 23 Oct 2016 19:24:00 +0200

Subject: [PATCH] Make service work when the service is not present in rc.conf

After installing a package from the ports collection on a

fresh FreeBSD 11.0, Ansible was unable to enable it, failing with

"unable to get current rcvar value". Debugging showed that sysrc

didn't see the variable from /usr/local/etc/rc.d/myservice, but

adding the value was working.

So we will just fallback to the default value if we can't find it.

---

 system/service.py | 6 ++++--

 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git system/service.py system/service.py

index d216e68..c8781b1 100644

--- lib/ansible/modules/core/system/service.py

+++ lib/ansible/modules/core/system/service.py

@@ -988,7 +988,7 @@ def service_enable(self):

         # and hope for the best.

         for rcvar in rcvars:

             if '=' in rcvar:

-                self.rcconf_key = rcvar.split('=')[0]

+                self.rcconf_key, default_rcconf_value = rcvar.split('=', 1)

                 break

         if self.rcconf_key is None:

@@ -997,8 +997,10 @@ def service_enable(self):

         if self.sysrc_cmd: # FreeBSD >= 9.2

             rc, current_rcconf_value, stderr = self.execute_command("%s -n %s" % (self.sysrc_cmd, self.rcconf_key))

+            # it can happen that rcvar is not set (case of a system coming from the ports collection)

+            # so we will fallback on the default

             if rc != 0:

-                self.module.fail_json(msg="unable to get current rcvar value", stdout=stdout, stderr=stderr)

+                current_rcconf_value = default_rcconf_value

             if current_rcconf_value.strip().upper() != self.rcconf_value: