Merge branch 'hg'

Author: jakub-horak

.hgtags

@@ -510,3 +510,4 @@ da5d68806e4acacc7259e6a1dc6a07b9232e3443 st190
 70a84568ef49b6974148640d973599088d2cb580 st200
 fa6fc60a9d8ab4981317c5be18e47b28868691e5 st201
 fa6fc60a9d8ab4981317c5be18e47b28868691e5 11.4.84.0.1.201.0
+4aa2fc1df7c1cf43786bcb1d7a75fea721f9864e st202

src/svc/svc-pkg-auto-update

@@ -92,7 +92,7 @@ def start():
             message = 'Invalid configuration: config/auto-reboot = true ' + \
                 'with config/activate-new-be = false'
             smf_include.smf_method_exit(smf_include.SMF_EXIT_ERR_CONFIG,
-                                        'invalid configuration', message)
+                                        'invalid-configuration', message)
         cmd.append('--no-be-activate')
 
     # Add any extra args that should be passed to pkg, eg for verbose output
@@ -157,9 +157,13 @@ def start():
             print('Running reboot-check-hook {0}'.format(reboot_hook))
             exitcode, output = subprocess.getstatusoutput(reboot_hook)
             if exitcode != 0:
-                print('reboot-check-hook failed')
+                message = f'Reboot Hook failed {exitcode}, see service log'
                 smf_include.smf_method_exit(smf_include.SMF_EXIT_DEGRADED,
-                                            'reboot-check-hook failed', output)
+                                            'reboot-check-hook-failed',
+                                            message)
+                print('Reboot hook output follows:')
+                print(output)
+
         print('Reboot after auto update')
         msg = myfmri + ' : automatic reboot after update'
         try: