X-Git-Url: https://code.delx.au/refind/blobdiff_plain/7f97f502da6c482383f038970e788e1d005d391b..HEAD:/refind/config.c

diff --git a/refind/config.c b/refind/config.c
index f592eb9..6f33549 100644
--- a/refind/config.c
+++ b/refind/config.c
@@ -63,6 +63,7 @@
 #include "config.h"
 #include "screen.h"
 #include "apple.h"
+#include "mystrings.h"
 #include "../include/refit_call_wrapper.h"
 #include "../mok/mok.h"
 
@@ -523,6 +524,7 @@ VOID ReadConfig(CHAR16 *FileName)
        MyFreePool(GlobalConfig.DontScanFiles);
        GlobalConfig.DontScanFiles = StrDuplicate(DONT_SCAN_FILES);
        MergeStrings(&(GlobalConfig.DontScanFiles), MOK_NAMES, L',');
+       MergeStrings(&(GlobalConfig.DontScanFiles), FWUPDATE_NAMES, L',');
        MyFreePool(GlobalConfig.DontScanVolumes);
        GlobalConfig.DontScanVolumes = StrDuplicate(DONT_SCAN_VOLUMES);
        GlobalConfig.WindowsRecoveryFiles = StrDuplicate(WINDOWS_RECOVERY_FILES);
@@ -648,6 +650,8 @@ VOID ReadConfig(CHAR16 *FileName)
                    GlobalConfig.ShowTools[i - 1] = TAG_WINDOWS_RECOVERY;
                 } else if (MyStriCmp(FlagName, L"mok_tool")) {
                    GlobalConfig.ShowTools[i - 1] = TAG_MOK_TOOL;
+                } else if (MyStriCmp(FlagName, L"fwupdate")) {
+                   GlobalConfig.ShowTools[i - 1] = TAG_FWUPDATE_TOOL;
                 } else if (MyStriCmp(FlagName, L"csr_rotate")) {
                    GlobalConfig.ShowTools[i - 1] = TAG_CSR_ROTATE;
                 } else if (MyStriCmp(FlagName, L"firmware")) {
@@ -757,6 +761,8 @@ VOID ReadConfig(CHAR16 *FileName)
               ReadConfig(TokenList[1]);
            }
 
+        } else if (MyStriCmp(TokenList[0], L"enable_touch")) {
+           GlobalConfig.EnableTouch = HandleBoolean(TokenList, TokenCount);
         }
 
         FreeTokenLine(&TokenList, &TokenCount);
@@ -1133,14 +1139,9 @@ static REFIT_FILE * GenerateOptionsFromPartTypes(VOID) {
 // you pass this function the filename of the Linux kernel, initial RAM disk, or other
 // file in the target directory, and this function finds the file with a name in the
 // comma-delimited list of names specified by LINUX_OPTIONS_FILENAMES within that
-// directory and loads it. This function tries multiple files because I originally
-// used the filename linux.conf, but close on the heels of that decision, the Linux
-// kernel developers decided to use that name for a similar purpose, but with a
-// different file format. Thus, I'm migrating rEFInd to use the name refind_linux.conf,
-// but I want a migration period in which both names are used.
-// If a rEFInd options file can't be found, try to generate minimal options from
-// /etc/fstab on the same volume as the kernel. This typically works only if the
-// kernel is being read from the Linux root filesystem.
+// directory and loads it. If a rEFInd options file can't be found, try to generate
+// minimal options from /etc/fstab on the same volume as the kernel. This typically
+// works only if the kernel is being read from the Linux root filesystem.
 //
 // The return value is a pointer to the REFIT_FILE handle for the file, or NULL if
 // it wasn't found.