From: srs5694 Date: Tue, 27 Oct 2015 13:39:06 +0000 (-0400) Subject: Minor cleanups X-Git-Url: https://code.delx.au/refind/commitdiff_plain/01d6efef434287c7661d149b4f34dbfb156ce7ec?hp=1e45a07f1a4521411ccd61dffe00e7ceebd38824 Minor cleanups --- diff --git a/NEWS.txt b/NEWS.txt index 1d23782..49ce0b3 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,3 +1,12 @@ +0.9.3 (??/??/2015): +------------------- + +- Under OS X, install.sh can now be run from the recovery system. This may + help work around OS X 10.11's problems with System Integrity Protection, + since it should be possible to reboot into the recovery system to install + rEFInd without disabling SIP for the main installation, even for just one + boot. + 0.9.2 (9/19/2015): ------------------ diff --git a/install.sh b/install.sh index 82a2a16..99896f2 100755 --- a/install.sh +++ b/install.sh @@ -36,6 +36,7 @@ # # Revision history: # +# 0.9.3 -- Enable running under OS X's recovery system. # 0.9.2 -- Added --keepname option. # 0.8.7 -- Better detection of Secure Boot mode & fixed errors when copying # Shim & MokManager files over themselves; fixed bug that caused diff --git a/refind/config.c b/refind/config.c index 194dcb8..3029e2b 100644 --- a/refind/config.c +++ b/refind/config.c @@ -698,8 +698,8 @@ VOID ReadConfig(CHAR16 *FileName) } else if (MyStriCmp(TokenList[0], L"max_tags")) { HandleInt(TokenList, TokenCount, &(GlobalConfig.MaxTags)); - } else if (MyStriCmp(TokenList[0], L"enable_and_lock_vmx")) { - GlobalConfig.EnableAndLockVMX = HandleBoolean(TokenList, TokenCount); + } else if (MyStriCmp(TokenList[0], L"enable_and_lock_vmx")) { + GlobalConfig.EnableAndLockVMX = HandleBoolean(TokenList, TokenCount); } else if (MyStriCmp(TokenList[0], L"include") && (TokenCount == 2) && MyStriCmp(FileName, GlobalConfig.ConfigFilename)) { if (!MyStriCmp(TokenList[1], FileName)) { diff --git a/refind/menu.c b/refind/menu.c index 8fe0c1e..dc3121d 100644 --- a/refind/menu.c +++ b/refind/menu.c @@ -62,6 +62,7 @@ #include "config.h" #include "libeg.h" #include "libegint.h" +#include "line_edit.h" #include "../include/refit_call_wrapper.h" #include "../include/egemb_back_selected_small.h"