File cloud-init-pckg-reboot.patch of Package cloud-init

Overview Repositories Revisions Requests Users Attributes Meta

File cloud-init-pckg-reboot.patch of Package cloud-init (Revision 91577b9c4b37a4b158e172688fada975)

Currently displaying revision 91577b9c4b37a4b158e172688fada975 , Show latest

--- cloudinit/config/cc_package_update_upgrade_install.py.orig
+++ cloudinit/config/cc_package_update_upgrade_install.py
@@ -18,7 +18,7 @@ from cloudinit.config.schema import Meta
 from cloudinit.distros import ALL_DISTROS
 from cloudinit.settings import PER_INSTANCE
 
-REBOOT_FILE = "/var/run/reboot-required"
+REBOOT_FILES = ("/var/run/reboot-required", "/run/reboot-needed")
 REBOOT_CMD = ["/sbin/reboot"]
 
 MODULE_DESCRIPTION = """\
@@ -120,11 +120,14 @@ def handle(name: str, cfg: Config, cloud
     # kernel and openssl (possibly some other packages)
     # write a file /var/run/reboot-required after upgrading.
     # if that file exists and configured, then just stop right now and reboot
-    reboot_fn_exists = os.path.isfile(REBOOT_FILE)
+    for reboot_marker in REBOOT_FILES:
+        reboot_fn_exists = os.path.isfile(reboot_marker)
+        if reboot_fn_exists:
+            break
     if (upgrade or pkglist) and reboot_if_required and reboot_fn_exists:
         try:
             LOG.warning(
-                "Rebooting after upgrade or install per %s", REBOOT_FILE
+                "Rebooting after upgrade or install per %s", reboot_marker
             )
             # Flush the above warning + anything else out...
             logging.flushLoggers(LOG)

Places

File cloud-init-pckg-reboot.patch of Package cloud-init (Revision 91577b9c4b37a4b158e172688fada975)

Places