mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-11 23:09:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Clear bootstrap mode if there are no Munki updates and no Apple updates we can actually install without user help.

Browse Source
This commit is contained in:
Greg Neagle
2020-05-26 10:46:16 -07:00
parent 678819bfc2
commit c53be5860e
3 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/managedsoftwareupdate
+14
View File
@@ -991,6 +991,20 @@ def main():
options.installonly = False
options.auto = True
if runtype == 'checkandinstallatstartup':
# we're in bootstrap mode
if not updatesavailable and appleupdatesavailable:
# there are only Apple updates, but we might not be able to install
# some
if not appleupdates.installableUpdates():
# there are no Apple updates we can actually install without
# user assistance, so clear bootstrapping mode so we don't loop
# endlessly
try:
bootstrapping.clear_bootstrap_mode()
except bootstrapping.SetupError as err:
display.display_error(err)
if updatesavailable or appleupdatesavailable:
if options.installonly or options.logoutinstall:
# just install