Merge pull request #53935 from morganwillcock/2018.3

Power-off when shutting down FreeBSD, NetBSD, and OpenBSD
saltstack · Dec 14, 2019 · 9962b4b · 9962b4b
2 parents dbadcbe + d33eeb1
commit 9962b4b
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 3 deletions.
diff --git a/salt/modules/system.py b/salt/modules/system.py
@@ -122,7 +122,15 @@ def shutdown(at_time=None):
 
         salt '*' system.shutdown 5
     '''
-    cmd = ['shutdown', '-h', ('{0}'.format(at_time) if at_time else 'now')]
+    if (salt.utils.platform.is_freebsd() or
+            salt.utils.platform.is_netbsd() or
+            salt.utils.platform.is_openbsd()):
+        # these platforms don't power off by default when halted
+        flag = '-p'
+    else:
+        flag = '-h'
+
+    cmd = ['shutdown', flag, ('{0}'.format(at_time) if at_time else 'now')]
     ret = __salt__['cmd.run'](cmd, python_shell=False)
     return ret
 

diff --git a/tests/unit/modules/test_system.py b/tests/unit/modules/test_system.py
@@ -69,6 +69,46 @@ def test_shutdown(self):
         '''
         Test to shutdown a running system
         '''
-        with patch.dict(system.__salt__,
-                        {'cmd.run': MagicMock(return_value='A')}):
+        cmd_mock = MagicMock(return_value='A')
+        with patch.dict(system.__salt__, {'cmd.run': cmd_mock}), \
+                patch('salt.utils.platform.is_freebsd', MagicMock(return_value=False)), \
+                patch('salt.utils.platform.is_netbsd', MagicMock(return_value=False)), \
+                patch('salt.utils.platform.is_openbsd', MagicMock(return_value=False)):
+            self.assertEqual(system.shutdown(), 'A')
+        cmd_mock.assert_called_with(['shutdown', '-h', 'now'], python_shell=False)
+
+    def test_shutdown_freebsd(self):
+        '''
+        Test to shutdown a running FreeBSD system
+        '''
+        cmd_mock = MagicMock(return_value='A')
+        with patch.dict(system.__salt__, {'cmd.run': cmd_mock}), \
+                patch('salt.utils.platform.is_freebsd', MagicMock(return_value=True)), \
+                patch('salt.utils.platform.is_netbsd', MagicMock(return_value=False)), \
+                patch('salt.utils.platform.is_openbsd', MagicMock(return_value=False)):
+            self.assertEqual(system.shutdown(), 'A')
+        cmd_mock.assert_called_with(['shutdown', '-p', 'now'], python_shell=False)
+
+    def test_shutdown_netbsd(self):
+        '''
+        Test to shutdown a running NetBSD system
+        '''
+        cmd_mock = MagicMock(return_value='A')
+        with patch.dict(system.__salt__, {'cmd.run': cmd_mock}), \
+                patch('salt.utils.platform.is_freebsd', MagicMock(return_value=False)), \
+                patch('salt.utils.platform.is_netbsd', MagicMock(return_value=True)), \
+                patch('salt.utils.platform.is_openbsd', MagicMock(return_value=False)):
+            self.assertEqual(system.shutdown(), 'A')
+        cmd_mock.assert_called_with(['shutdown', '-p', 'now'], python_shell=False)
+
+    def test_shutdown_openbsd(self):
+        '''
+        Test to shutdown a running OpenBSD system
+        '''
+        cmd_mock = MagicMock(return_value='A')
+        with patch.dict(system.__salt__, {'cmd.run': cmd_mock}), \
+                patch('salt.utils.platform.is_freebsd', MagicMock(return_value=False)), \
+                patch('salt.utils.platform.is_netbsd', MagicMock(return_value=False)), \
+                patch('salt.utils.platform.is_openbsd', MagicMock(return_value=True)):
             self.assertEqual(system.shutdown(), 'A')
+        cmd_mock.assert_called_with(['shutdown', '-p', 'now'], python_shell=False)