Add reboot option to DNF Automatic

AUTHORS

@@ -69,6 +69,7 @@ DNF CONTRIBUTORS
     Dave Johansen <[email protected]>
     Dylan Pindur <[email protected]>
     Eduard Cuba <[email protected]>
+    Evan Goode <[email protected]>
     Filipe Brandenburger <[email protected]>
     Frank Dana <[email protected]>
     George Machitidze <[email protected]>

dnf/automatic/main.py

@@ -24,6 +24,7 @@
 
 import argparse
 import logging
+import os
 import random
 import socket
 import time
@@ -179,6 +180,9 @@ def __init__(self):
                         libdnf.conf.VectorString(['default', 'security'])))
         self.add_option('random_sleep', libdnf.conf.OptionNumberInt32(300))
         self.add_option('network_online_timeout', libdnf.conf.OptionNumberInt32(60))
+        self.add_option('reboot', libdnf.conf.OptionEnumString('never',
+                        libdnf.conf.VectorString(['never', 'when-changed', 'when-needed'])))
+        self.add_option('reboot_command', libdnf.conf.OptionString('shutdown -r +5 \'Rebooting after applying package updates\''))
 
     def imply(self):
         if self.apply_updates:
@@ -340,6 +344,11 @@ def main(args):
             base.do_transaction()
             emitters.notify_applied()
             emitters.commit()
+
+            if (conf.commands.reboot == 'when-changed' or
+               (conf.commands.reboot == 'when-needed' and base.reboot_needed())):
+                if os.waitstatus_to_exitcode(os.system(conf.commands.reboot_command)) != 0:
+                    return 1
     except dnf.exceptions.Error as exc:
         logger.error(_('Error: %s'), ucd(exc))
         return 1

dnf/base.py

@@ -2794,6 +2794,20 @@ def _nevra(item):
 
         return skipped_conflicts, skipped_dependency
 
+    def reboot_needed(self):
+        """Check whether a system reboot is recommended following the transaction
+
+        :return: bool
+        """
+        if not self.transaction:
+            return False
+
+        # List taken from DNF needs-restarting
+        need_reboot = frozenset(('kernel', 'kernel-rt', 'glibc',
+                                'linux-firmware', 'systemd', 'dbus',
+                                'dbus-broker', 'dbus-daemon'))
+        changed_pkgs = self.transaction.install_set | self.transaction.remove_set
+        return any(pkg.name in need_reboot for pkg in changed_pkgs)
 
 def _msg_installed(pkg):
     name = ucd(pkg)

doc/automatic.rst

@@ -90,6 +90,18 @@ Setting the mode of operation of the program.
 
     What kind of upgrades to look at. ``default`` signals looking for all available updates, ``security`` only those with an issued security advisory.
 
+``reboot``
+    either one of ``never``, ``when-changed``, ``when-needed``, default: ``never``
+
+    When the system should reboot following upgrades. ``never`` does not reboot the system. ``when-changed`` triggers a reboot after any upgrade. ``when-needed`` triggers a reboot only when rebooting is necessary to apply changes, such as when systemd or the kernel is upgraded.
+
+``reboot_command``
+    string, default: ``shutdown -r +5 'Rebooting after applying package updates'``
+
+    Specify the command to run to trigger a reboot of the system. For example, to skip the 5-minute delay and wall message, use ``shutdown -r``
+
+
+
 ----------------------
 ``[emitters]`` section
 ----------------------

etc/dnf/automatic.conf

@@ -21,6 +21,15 @@ download_updates = yes
 # install.timer override this setting.
 apply_updates = no
 
+# When the system should reboot following upgrades:
+# never                              = don't reboot after upgrades
+# when-changed                       = reboot after any changes
+# when-needed                        = reboot when necessary to apply changes
+reboot = never
+
+# The command that is run to trigger a system reboot.
+reboot_command = "shutdown -r +5 'Rebooting after applying package updates'"
+
 
 [emitters]
 # Name to use for this system in messages that are emitted.  Default is the

tests/automatic/test_main.py

@@ -49,3 +49,7 @@ def test_load(self):
         conf = dnf.automatic.main.AutomaticConfig(FILE, downloadupdates=True, installupdates=False)
         self.assertTrue(conf.commands.download_updates)
         self.assertFalse(conf.commands.apply_updates)
+
+        # test that reboot is "never" by default
+        conf = dnf.automatic.main.AutomaticConfig(FILE)
+        self.assertEqual(conf.commands.reboot, 'never')