Some tweaks to information provided by install.sh; addition of

PreLoader.efi to default dont_scan_files token.

diff --git a/NEWS.txt b/NEWS.txt
index 0b98e76eb45603db2bbe1e0e9caac3e1056209ba..23545371fd459f51c6a8b3c525aca6c91d7eeef6 100644 (file)
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,6 +1,10 @@
 0.7.2 (?/??/2013):
 ------------------
 
+- Added PreLoader.efi to default dont_scan_files list; it's now "shim.efi,
+  PreLoader.efi, TextMode.efi, ebounce.efi, GraphicsConsole.efi,
+  MokManager.efi, HashTool.efi, HashTool-signed.efi".
+
 - Added icon for Funtoo Linux.
 
 - Fixed reading of volume icons from user-specified icons directory, which

diff --git a/docs/refind/configfile.html b/docs/refind/configfile.html
index be80dcfaeaef969c219dbb8e46e207d0cd44b462..f6c05b3b4ebf3adab2889e1ee24ac4903c97470d 100644 (file)
--- a/docs/refind/configfile.html
+++ b/docs/refind/configfile.html
@@ -304,7 +304,7 @@ timeout 20
 <tr>
    <td><tt>dont_scan_files</tt> or <tt>don't_scan_files</tt></td>
    <td>filename(s)</td>
-   <td>Adds the specified filename or filenames to a filename "blacklist"&mdash;these files are <i>not</i> included as boot loader options even if they're found on the disk. This is useful to exclude support programs (such as <tt>shim.efi</tt> and <tt>MokManager.efi</tt>) and drivers from your OS list. The default value is <tt>shim.efi, MokManager.efi, HashTool.efi, TextMode.efi, ebounce.efi, GraphicsConsole.efi</tt>.</td>
+   <td>Adds the specified filename or filenames to a filename "blacklist"&mdash;these files are <i>not</i> included as boot loader options even if they're found on the disk. This is useful to exclude support programs (such as <tt>shim.efi</tt> and <tt>MokManager.efi</tt>) and drivers from your OS list. The default value is <tt>shim.efi, PreLoader.efi, TextMode.efi, ebounce.efi, GraphicsConsole.efi</tt>, <tt>MokManager.efi</tt>, <tt>HashTool.efi</tt>, <tt>HashTool-signed.efi</tt>.</td>
 </tr>
 <tr>
    <td><tt>scan_all_linux_kernels</tt></td>

diff --git a/install.sh b/install.sh
index a4675f1ef4f33f792407f21fbaa7286d094b3dff..2239a72f919820a0cb59fc158a361df0fe9fd6ae 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -638,7 +638,6 @@ FindLinuxESP() {
    if [[ -n "$InstallDir" ]] ; then
       EspFilesystem=`grep "$InstallDir" /etc/mtab | uniq | grep -v autofs | cut -d " " -f 3`
    fi
-   echo "EspFilesystem is '$EspFilesystem'"
    if [[ $EspFilesystem != 'vfat' ]] ; then
       echo "$RootDir/boot/efi doesn't seem to be on a VFAT filesystem. The ESP must be"
       echo "mounted at $RootDir/boot or $RootDir/boot/efi and it must be VFAT! Aborting!"
@@ -695,6 +694,8 @@ AddBootEntry() {
       echo "rename the $Refind binary to the default name (EFI/boot/bootx64.efi"
       echo "on x86-64 systems or EFI/boot/bootia32.efi on x86 systems) to have it run!"
       echo
+   else
+      echo "rEFInd has been set as the default boot manager."
    fi
 } # AddBootEntry()
 
@@ -703,6 +704,7 @@ GenerateRefindLinuxConf() {
    if [[ -f "$RLConfFile" ]] ; then
       echo "Existing $RLConfFile found; not overwriting."
    else
+      echo "Creating $RLConfFile; edit it to adjust kernel options."
       if [[ -f "$RootDir/etc/default/grub" ]] ; then
          # We want the default options used by the distribution, stored here....
          source "$RootDir/etc/default/grub"

diff --git a/refind.conf-sample b/refind.conf-sample
index 3f3ae26b30386c532ea8cb87a8141b9d750bbf18..5d49d01f76962fc022751bcb8e26eb21bf528d0d 100644 (file)
--- a/refind.conf-sample
+++ b/refind.conf-sample
@@ -232,7 +232,7 @@ timeout 20
 # set of tools. Most notably, MokManager.efi is in this blacklist,
 # but will show up as a tool if present in certain directories. You
 # can control the tools row with the showtools token.
-# The default is shim.efi,TextMode.efi,ebounce.efi,GraphicsConsole.efi,MokManager.efi,HashTool.efi,HashTool-signed.efi
+# The default is shim.efi,PreLoader.efi,TextMode.efi,ebounce.efi,GraphicsConsole.efi,MokManager.efi,HashTool.efi,HashTool-signed.efi
 #
 #dont_scan_files shim.efi,MokManager.efi
 

diff --git a/refind/config.h b/refind/config.h
index fd26572ef4dedd0c52f79692625ef4506c91b4bb..58f04ea9797ebdd3a173d83ff4ecf64b2d6b3d41 100644 (file)
--- a/refind/config.h
+++ b/refind/config.h
@@ -80,7 +80,7 @@ typedef struct {
 
 #define CONFIG_FILE_NAME         L"refind.conf"
 // Note: Below is combined with MOK_NAMES to make default
-#define DONT_SCAN_FILES L"shim.efi,TextMode.efi,ebounce.efi,GraphicsConsole.efi"
+#define DONT_SCAN_FILES L"shim.efi,PreLoader.efi,TextMode.efi,ebounce.efi,GraphicsConsole.efi"
 #define DONT_SCAN_VOLUMES L"Recovery HD"
 #define ALSO_SCAN_DIRS L"boot"