Fixed bug that prevented "icon" token in refind.conf manual boot

[refind] / install.sh

diff --git a/install.sh b/install.sh
index e5fd60452a7c702de5c8b0933f9e5a011075a980..5dd99c1a9b27ea6ec62e3a1f9223ab3ce01cf38f 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -29,6 +29,8 @@
 #
 # Revision history:
 #
+# 0.6.6   -- Bug fix: Upgrade drivers when installed to EFI/BOOT.
+# 0.6.4   -- Copies ext2 driver rather than ext4 driver for ext2/3fs
 # 0.6.3   -- Support for detecting rEFInd in EFI/BOOT and EFI/Microsoft/Boot
 #            directories & for installing to EFI/BOOT in BIOS mode
 # 0.6.2-1 -- Added --yes option & tweaked key-copying for use with RPM install script
@@ -219,7 +221,11 @@ CopyDrivers() {
       BootFS=`blkid -o export $BootPart 2> /dev/null | grep TYPE= | cut -f 2 -d =`
       DriverType=""
       case $BootFS in
-         ext2 | ext3 | ext4) DriverType="ext4"
+         ext2 | ext3) DriverType="ext2"
+              # Could use ext4, but that can create unwanted entries from symbolic
+              # links in / to /boot/vmlinuz if a separate /boot partition is used.
+              ;;
+         ext4) DriverType="ext4"
               ;;
          reiserfs) DriverType="reiserfs"
               ;;
@@ -256,6 +262,12 @@ CopyRefindFiles() {
       if [[ $InstallDrivers == "all" ]] ; then
          cp -r $RefindDir/drivers_* $InstallDir/$TargetDir/ 2> /dev/null
          cp -r $ThisDir/drivers_* $InstallDir/$TargetDir/ 2> /dev/null
+      elif [[ $Upgrade == 1 ]] ; then
+         if [[ $Platform == 'EFI64' ]] ; then
+            CopyDrivers x64
+         else
+            CopyDrivers ia32
+         fi
       fi
       Refind=""
       CopyKeys