Merge branch 'hg'

Author: jakub-horak

.hgtags

@@ -515,3 +515,5 @@ d3a4e98be3b2016eecfd2fc31437d9b386a9b0c0 st203
 611b9daec17e8217a55d6418976b2c407604f26d st204
 acf995441b3cfe6bea0fa77889d9d163feba4ab5 st205
 acf995441b3cfe6bea0fa77889d9d163feba4ab5 st206
+0b7ad5b7298ab0e67c46d168776275c35807247f st207
+0b7ad5b7298ab0e67c46d168776275c35807247f 11.4.87.0.1.207.0

src/pkg/Makefile

@@ -28,7 +28,7 @@ UPDATENUM         = 4
 # The SRUNUM will need to be reset once the final trunk build for
 # the delivery from trunk has been delivered.
 #
-SRUNUM            = 87
+SRUNUM            = 90
 ORDER             = 0
 #
 # In the normal case the PLATNUM should be 0, however when

src/pkg/external_deps.txt

@@ -54,6 +54,7 @@
     # Only the variant used by pkg(7) utilities is listed here;
     # this is to avoid unnecessary circular dependencies with ON.
     pkg:/system/library/python/solaris-core-311
+    pkg:/system/python/boot-environment-utilities-311
     pkg:/system/library/security/crypto
     pkg:/system/library/smf
     pkg:/system/linker

src/svc/svc-pkg-auto-update.py

@@ -26,6 +26,7 @@
 import pkg.no_site_packages
 import pkg.smf as smf
 import pkg.client.pkgdefs as pkgdefs
+import bemgmt
 import smf_include
 import os
 import subprocess
@@ -121,8 +122,7 @@ def start():
         pkg_status = subprocess.call(cmd)
         if pkg_status != pkgdefs.EXIT_LOCKED:
             break
-        print('Image locked, sleeping for {0} seconds'.format(wait_secs),
-              flush=True)
+        print(f'Image locked, sleeping for {wait_secs} seconds', flush=True)
         time.sleep(wait_secs)
 
     if pkg_status == pkgdefs.EXIT_NOP:
@@ -154,15 +154,24 @@ def start():
     new_be_activated = pkgplan['activate-be']
     if new_be_created and new_be_activated and auto_reboot:
         if check_before_reboot:
-            print('Running reboot-check-hook {0}'.format(reboot_hook))
+            print(f'Running reboot-check-hook {reboot_hook}')
             exitcode, output = subprocess.getstatusoutput(reboot_hook)
             if exitcode != 0:
+                print(output)
+                bename = pkgplan['be-name']
+                print(f'Reboot Hook failed {exitcode}, removing {bename}')
+                # Remove the BE as a future auto-update may create the same BE.
+                # Leaving it risks it becoming stale and surprising the
+                # admin on a manual reboot.
+                try:
+                    bemgmt.BEManager().destroy(bename)
+                except bemgmt.be_errors.BeMgmtError as e:
+                    print(f"BE destroy failed: {e}")
+                    pass
                 message = f'Reboot Hook failed {exitcode}, see service log'
                 smf_include.smf_method_exit(smf_include.SMF_EXIT_DEGRADED,
                                             'reboot-check-hook-failed',
                                             message)
-                print('Reboot hook output follows:')
-                print(output)
 
         print('Reboot after auto update')
         msg = myfmri + ' : automatic reboot after update'