From 293d6c59bbd44bfffc2ff7922b35c10a07e63418 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Wed, 29 Jul 2020 16:52:45 -0400 Subject: [PATCH] [stable-2.10] reboot - fix Void Linux (#70704) (#70916) Add entry for appropriate commands for Void Linux (cherry picked from commit 4cc4cebc97) Co-authored-by: fosslinux Co-authored-by: fosslinux --- changelogs/fragments/70704-void-linux-reboot.yml | 3 +++ lib/ansible/plugins/action/reboot.py | 1 + 2 files changed, 4 insertions(+) create mode 100644 changelogs/fragments/70704-void-linux-reboot.yml diff --git a/changelogs/fragments/70704-void-linux-reboot.yml b/changelogs/fragments/70704-void-linux-reboot.yml new file mode 100644 index 00000000000..b35feb904dc --- /dev/null +++ b/changelogs/fragments/70704-void-linux-reboot.yml @@ -0,0 +1,3 @@ +bugfixes: + - reboot - Add support for the runit init system, used on Void Linux, that + does not support the normal Linux syntax. diff --git a/lib/ansible/plugins/action/reboot.py b/lib/ansible/plugins/action/reboot.py index 7d4d6871bc5..d898a1aec22 100644 --- a/lib/ansible/plugins/action/reboot.py +++ b/lib/ansible/plugins/action/reboot.py @@ -67,6 +67,7 @@ class ActionModule(ActionBase): SHUTDOWN_COMMAND_ARGS = { 'alpine': '', + 'void': '-r +{delay_min} "{message}"', 'freebsd': '-r +{delay_sec}s "{message}"', 'linux': DEFAULT_SHUTDOWN_COMMAND_ARGS, 'macosx': '-r +{delay_min} "{message}"',