mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-02-26 02:49:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fv-auth-restart'

Browse Source
This commit is contained in:
Greg Neagle
2016-11-28 10:44:33 -08:00
parent 069810a1ad 97499e703c
commit 5ae397eee4
2 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/client/managedsoftwareupdate
View File

@@ -279,6 +279,17 @@ def doRestart():
if not consoleuser or consoleuser == u'loginwindow':
# no-one is logged in or we're at the loginwindow
time.sleep(5)
#check to see if we should perform an AuthRestart
if (munkicommon.pref('PerformAuthRestarts')
and munkicommon.pref('RecoveryKeyFile')):
munkicommon.log('Starting Authorized Restart...')
# try to perform an auth restart
munkicommon.perform_auth_restart()
time.sleep(2)
# if we got to here then the auth restart failed, notify that it did
# then perform a normal restart
munkicommon.display_warning(
'Authorized Restart Failed. Performing normal restart...')
dummy_retcode = subprocess.call(['/sbin/shutdown', '-r', 'now'])
else:
if munkicommon.munkistatusoutput: