From a76d60a694a1c20758b89e7e7d564d1a609a572e Mon Sep 17 00:00:00 2001 From: Wesley Whetstone Date: Wed, 22 Jun 2016 10:10:51 -0700 Subject: [PATCH] fixing some logging and comments on munkicommon --- code/client/munkilib/munkicommon.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/client/munkilib/munkicommon.py b/code/client/munkilib/munkicommon.py index bcd34798..b6942ee1 100755 --- a/code/client/munkilib/munkicommon.py +++ b/code/client/munkilib/munkicommon.py @@ -2772,8 +2772,11 @@ def blockingApplicationsRunning(pkginfoitem): return False def supports_auth_restart(): - """Check if the the machine supports and authorized - restart, returns True or False accordingly""" + """Check if the machine supports an authorized + restart, returns True or False accordingly + NOTE: This does not check to see if FileVault is + enabled as it may return true on a machine with + FileVault disabled.""" cmd = ['/usr/bin/fdesetup', 'supportsauthrestart'] if subprocess.check_output(cmd).strip() == 'true': return True @@ -2820,7 +2823,7 @@ def perform_auth_restart(): return '' key = { 'Password': recovery_key } inputplist = FoundationPlist.writePlistToString(key) - log('Atempting an Authorized Restart Now...') + log('Attempting an Authorized Restart Now...') cmd = subprocess.Popen( ['/usr/bin/fdesetup','authrestart','-inputplist'], stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE)