Minor cleanups

diff --git a/NEWS.txt b/NEWS.txt
index 1d2378232769952ffe69b94b09ccc6aad61304e3..49ce0b3027a73a08f4d1773f7e8b0781cd224fb1 100644 (file)
--- 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 82a2a16be8f717e5d9f9864490e245a0471f7f6d..99896f29769c821a5694305a9b74cf3f5c1eadc6 100755 (executable)
--- 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 194dcb8c21baa7c11848bc824b0facc20b056a56..3029e2b77f06ef52be9b072c2793d4e29c0d8923 100644 (file)
--- 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 8fe0c1e19d48b120279dd32017b2adb9f7e6ed59..dc3121df2af2ea094909d64e3c481e903684e661 100644 (file)
--- 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"