Skip to content

Commit

Permalink
freebsd: shutdown -p ... on freebsd to power off machine (#7102)
Browse files Browse the repository at this point in the history
* freebsd: shutdown -p ... on freebsd to power off machine

* Use shutdown -p ... on FreeBSD such that the machine is halted and
  powered off (-p) otherwise the machine is halted (-h) but remains on.

* Update changelogs/fragments/7102-freebsd-shutdown-p.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
  • Loading branch information
derekschrock and felixfontein authored Aug 14, 2023
1 parent bf728aa commit 55cfd27
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/7102-freebsd-shutdown-p.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- shutdown - use ``shutdown -p ...`` with FreeBSD to halt and power off machine (https://github.com/ansible-collections/community.general/pull/7102).
2 changes: 1 addition & 1 deletion plugins/action/shutdown.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class ActionModule(ActionBase):
SHUTDOWN_COMMAND_ARGS = {
'alpine': '',
'void': '-h +{delay_min} "{message}"',
'freebsd': '-h +{delay_sec}s "{message}"',
'freebsd': '-p +{delay_sec}s "{message}"',
'linux': DEFAULT_SHUTDOWN_COMMAND_ARGS,
'macosx': '-h +{delay_min} "{message}"',
'openbsd': '-h +{delay_min} "{message}"',
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/targets/shutdown/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
- name: Verify shutdown delay is present in seconds in FreeBSD
assert:
that:
- '"-h +100s" in shutdown_result["shutdown_command"]'
- '"-h +0s" in shutdown_result_minus["shutdown_command"]'
- '"-p +100s" in shutdown_result["shutdown_command"]'
- '"-p +0s" in shutdown_result_minus["shutdown_command"]'
when: ansible_system == 'FreeBSD'

- name: Verify shutdown delay is present in seconds in Solaris, SunOS
Expand Down

0 comments on commit 55cfd27

Please sign in to comment.