Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
2Shirt 2018-10-02 23:10:26 -06:00
commit 588fa8d51a

View file

@ -58,12 +58,12 @@ def check_secure_boot_status():
if boot_mode != 'UEFI': if boot_mode != 'UEFI':
raise OSInstalledLegacyError raise OSInstalledLegacyError
else: else:
# Check error message # Check error message
err = result.stderr.decode() err = result.stderr.decode()
if 'Cmdlet not supported' in err: if 'Cmdlet not supported' in err:
raise SecureBootNotAvailError raise SecureBootNotAvailError
else: else:
raise GenericError raise GenericError
def get_boot_mode(): def get_boot_mode():
"""Check if Windows is booted in UEFI or Legacy mode, returns str.""" """Check if Windows is booted in UEFI or Legacy mode, returns str."""