diff options
| author | Justin P <jpartain89@users.noreply.github.com> | 2016-11-05 13:53:22 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2016-11-05 13:53:22 +0300 |
| commit | 50b06efd303fa82284dfa1fd083ed18fa8a55ec6 (patch) | |
| tree | b1404a0f60402fc6512a11397eb75fcae618edd1 /include/tests_boot_services | |
| parent | 0f318a4b7c8f47e76ba0f4fb24027673bb04b9af (diff) | |
macOS Refactoring (#311)
* Default all macOS `OS` names as macOS. Added comments to specify `uname` outputs for better understanding.
* Refactored all `Mac` instances referring to macOS over to `macOS` formatting.
Tested on my own machine, unable to find any errors outside of normal parameters.
Diffstat (limited to 'include/tests_boot_services')
| -rw-r--r-- | include/tests_boot_services | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/tests_boot_services b/include/tests_boot_services index 5c296a12..2c02ae28 100644 --- a/include/tests_boot_services +++ b/include/tests_boot_services @@ -136,13 +136,13 @@ ################################################################################# # # Test : BOOT-5106 - # Description : Check if boot.efi is found on Mac OS X - Register --test-no BOOT-5106 --os "MacOS" --weight L --network NO --root-only YES --category security --description "Check EFI boot file on Mac OS X" + # Description : Check if boot.efi is found on macOS/macOS + Register --test-no BOOT-5106 --os "macOS" --weight L --network NO --root-only YES --category security --description "Check EFI boot file on Mac OS X/macOS" if [ ${SKIPTEST} -eq 0 ]; then FileExists ${ROOTDIR}System/Library/CoreServices/boot.efi if [ ${FILE_FOUND} -eq 1 ]; then - LogText "Result: found Mac OS X boot.efi file" - BOOT_LOADER="MacOS-boot-EFI" + LogText "Result: found macOS/Mac OS X boot.efi file" + BOOT_LOADER="macOS-boot-EFI" BOOT_LOADER_FOUND=1 fi fi @@ -201,8 +201,8 @@ LogText "Result: system not booted with Secure Boot (no SecureBoot file found)" fi ;; - #MacOS) - # TODO: Mac OS ioreg -l -p IODeviceTree | ${GREPBINARY} firmware-abi + #macOS) + # TODO: macOS ioreg -l -p IODeviceTree | ${GREPBINARY} firmware-abi #;; *) LogText "Result: no test implemented yet to test for UEFI on this platform" @@ -702,7 +702,7 @@ fi ;; - DragonFly | FreeBSD | MacOS) + DragonFly | FreeBSD | macOS) if [ ! -z "${SYSCTLBINARY}" ]; then TIME_BOOT=$(${SYSCTLBINARY} kern.boottime | ${AWKBINARY} '{ print $5 }' | ${SEDBINARY} -e 's/,//' | ${GREPBINARY} "[0-9]") TIME_NOW=$(date "+%s") |