Fix order of CLI arguments on FreeBSD (#81377)

When passing arguments on FreeBSD to service command the order is
important, otherwise the service command will ignore the arguments.
pull/82624/merge
Jens Carl 1 month ago committed by GitHub
parent 6aa8192131
commit eb3ea3ce5c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -0,0 +1,3 @@
---
bugfixes:
- service - fix order of CLI arguments on FreeBSD (https://github.com/ansible/ansible/pull/81377).

@ -1012,7 +1012,7 @@ class FreeBsdService(Service):
self.sysrc_cmd = self.module.get_bin_path('sysrc')
def get_service_status(self):
rc, stdout, stderr = self.execute_command("%s %s %s %s" % (self.svc_cmd, self.name, 'onestatus', self.arguments))
rc, stdout, stderr = self.execute_command("%s %s %s %s" % (self.svc_cmd, self.arguments, self.name, 'onestatus'))
if self.name == "pf":
self.running = "Enabled" in stdout
else:
@ -1032,7 +1032,7 @@ class FreeBsdService(Service):
if os.path.isfile(rcfile):
self.rcconf_file = rcfile
rc, stdout, stderr = self.execute_command("%s %s %s %s" % (self.svc_cmd, self.name, 'rcvar', self.arguments))
rc, stdout, stderr = self.execute_command("%s %s %s %s" % (self.svc_cmd, self.arguments, self.name, 'rcvar'))
try:
rcvars = shlex.split(stdout, comments=True)
except Exception:
@ -1097,7 +1097,7 @@ class FreeBsdService(Service):
if self.action == "reload":
self.action = "onereload"
ret = self.execute_command("%s %s %s %s" % (self.svc_cmd, self.name, self.action, self.arguments))
ret = self.execute_command("%s %s %s %s" % (self.svc_cmd, self.arguments, self.name, self.action))
if self.sleep:
time.sleep(self.sleep)

Loading…
Cancel
Save