From c6381afaa9463643273b4527c64d26ff7415b7e8 Mon Sep 17 00:00:00 2001
From: srs5694
Originally written: 3/14/2012; last Web page update: -5/13/2013, referencing rEFInd 0.6.11
+6/18/2013, referencing rEFInd 0.6.12I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
diff --git a/docs/refind/configfile.html b/docs/refind/configfile.html index 6b2e68c..bf402c7 100644 --- a/docs/refind/configfile.html +++ b/docs/refind/configfile.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.comOriginally written: 3/14/2012; last Web page update: -5/13/2013, referencing rEFInd 0.6.11
+6/18/2013, referencing rEFInd 0.6.12I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
diff --git a/docs/refind/drivers.html b/docs/refind/drivers.html index 15ac439..ff59c2d 100644 --- a/docs/refind/drivers.html +++ b/docs/refind/drivers.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.comOriginally written: 4/19/2012; last Web page update: -5/13/2013, referencing rEFInd 0.6.11
+6/18/2013, referencing rEFInd 0.6.12I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
diff --git a/docs/refind/features.html b/docs/refind/features.html index 818c72d..50b27d5 100644 --- a/docs/refind/features.html +++ b/docs/refind/features.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.comOriginally written: 3/14/2012; last Web page update: -5/13/2013, referencing rEFInd 0.6.11
+6/18/2013, referencing rEFInd 0.6.12I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
@@ -205,6 +205,8 @@ lack a usable CSM.Originally written: 3/14/2012; last Web page update: -5/13/2013, referencing rEFInd 0.6.11
+6/18/2013, referencing rEFInd 0.6.12I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
@@ -136,16 +136,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.comOriginally written: 3/14/2012; last Web page update: -5/13/2013, referencing rEFInd 0.6.11
+6/18/2013, referencing rEFInd 0.6.12I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
diff --git a/docs/refind/installing.html b/docs/refind/installing.html index 936e51c..fcdc0a1 100644 --- a/docs/refind/installing.html +++ b/docs/refind/installing.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.comOriginally written: 3/14/2012; last Web page update: -5/13/2013, referencing rEFInd 0.6.11
+6/18/2013, referencing rEFInd 0.6.12I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
@@ -380,8 +380,8 @@ install.sh [--esp | --usedefault device-file | --rootNote that the shell included in rEFInd's CD-R image version is a version 1 shell, so you can't use it for this purpose. You can, however, copy rEFInd's files from the CD-R. You can even launch the version 1 shell included with rEFInd and then use that to launch a version 2 shell. Once you've booted the shell, you can proceed as follows:
+Note that the IA32 shell included in rEFInd's CD-R image version is a version 1 shell, so you can't use it for this purpose. You can, however, copy rEFInd's files from the CD-R. You can even launch the version 1 shell included with rEFInd and then use that to launch a version 2 shell. The x86-64 shell on the CD-R is the alternate shell, which should work on any x86-64 computer. Once you've booted the shell, you can proceed as follows:
Originally written: 3/19/2012; last Web page update: -5/13/2013, referencing rEFInd 0.6.11
+6/18/2013, referencing rEFInd 0.6.12I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
@@ -186,7 +186,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.comIf you installed rEFInd 0.6.0 or later with its install.sh script from your regular Linux installation, chances are everything's set up; you should be able to reboot and see your Linux kernels as boot options. If you installed manually, from OS X, or from an emergency system, though, you may need to do a couple of things manually: -
When you reboot, you should see rEFInd options for your Linux kernels. If they work, your job is done, although you might want to apply some of the tweaks described in the maintenance-free setup section. If you have problems, you may need to adjust the refind_linux.conf file, as described in the detailed configuration section.
@@ -225,7 +230,8 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.comThe intent of this system is that distribution maintainers can place their kernels, initial RAM disks, and a refind_linux.conf file in their own subdirectories on the ESP, on EFI-accessible /boot partitions, or in /boot directories on EFI-accessible Linux root (/) partitions. rEFInd will detect these kernels and create one main menu entry for each kernel. Each entry will implement as many options as there are lines in the refind_linux.conf file. In this way, two or more distributions can each maintain their boot loader entries, without being too concerned about who maintains rEFInd as a whole.
diff --git a/docs/refind/revisions.html b/docs/refind/revisions.html index 4377524..ed3aebc 100644 --- a/docs/refind/revisions.html +++ b/docs/refind/revisions.html @@ -14,7 +14,7 @@by Roderick W. Smith, rodsmith@rodsbooks.com
-Last Web page update: 5/11/2013
+Last Web page update: 6/18/2013
I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
@@ -130,6 +130,8 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.comOriginally written: 11/13/2012; last Web page update: -5/13/2013, referencing rEFInd 0.6.11
+6/18/2013, referencing rEFInd 0.6.12I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
diff --git a/docs/refind/themes.html b/docs/refind/themes.html index 3410cae..956b926 100644 --- a/docs/refind/themes.html +++ b/docs/refind/themes.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.comOriginally written: 4/19/2012; last Web page update: -5/13/2013, referencing rEFInd 0.6.11
+6/18/2013, referencing rEFInd 0.6.12I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
diff --git a/docs/refind/todo.html b/docs/refind/todo.html index 2879cb1..2ab1637 100644 --- a/docs/refind/todo.html +++ b/docs/refind/todo.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.comOriginally written: 3/14/2012; last Web page update: -5/5/2013, referencing rEFInd 0.6.10
+6/18/2013, referencing rEFInd 0.6.12I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
@@ -225,6 +225,14 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.comOriginally written: 3/14/2012; last Web page update: -5/13/2013, referencing rEFInd 0.6.11
+6/18/2013, referencing rEFInd 0.6.12I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
diff --git a/install.sh b/install.sh index 4edb69a..1e87e7c 100755 --- a/install.sh +++ b/install.sh @@ -18,6 +18,7 @@ # "--nodrivers" to suppress driver installation (default in Linux is # driver used on /boot; --nodrivers is OS X default) # "--shim {shimfile}" to install a shim.efi file for Secure Boot +# "--preloader" is synonymous with "--shim" # "--localkeys" to re-sign x86-64 binaries with a locally-generated key # "--yes" to assume a "yes" response to all prompts # @@ -32,6 +33,7 @@ # # Revision history: # +# 0.6.12 -- Added support for PreLoader as well as for shim # 0.6.11 -- Improvements in script's ability to handle directories with spaces # in their names # 0.6.9 -- Install gptsync on Macs @@ -65,6 +67,7 @@ RootDir="/" TargetDir=/EFI/refind LocalKeysBase="refind_local" ShimSource="none" +ShimType="none" TargetShim="default" TargetX64="refind_x64.efi" TargetIA32="refind_ia32.efi" @@ -99,7 +102,8 @@ GetParams() { ;; --localkeys) LocalKeys=1 ;; - --shim) ShimSource="$2" + --shim | --preloader) ShimSource="$2" + ShimType=`basename $ShimSource` shift ;; --drivers | --alldrivers) InstallDrivers="all" @@ -179,10 +183,19 @@ CheckForFiles() { if [[ "$ShimSource" != "none" ]] ; then if [[ -f "$ShimSource" ]] ; then - TargetX64="grubx64.efi" - MokManagerSource=`dirname "$ShimSource"`/MokManager.efi + if [[ $ShimType == "shimx64.efi" || $ShimType == "shim.efi" ]] ; then + TargetX64="grubx64.efi" + MokManagerSource=`dirname "$ShimSource"`/MokManager.efi + elif [[ $ShimType == "preloader.efi" || $ShimType == "PreLoader.efi" ]] ; then + TargetX64="loader.efi" + MokManagerSource=`dirname "$ShimSource"`/HashTool.efi + else + echo "Unknown shim/PreBootloader filename: $ShimType!" + echo "Known filenames are shimx64.efi, shim.efi, and PreLoader.efi. Aborting!" + exit 1 + fi else - echo "The specified shim file, $ShimSource, doesn't exist!" + echo "The specified shim/PreBootloader file, $ShimSource, doesn't exist!" echo "Aborting installation!" exit 1 fi @@ -713,7 +726,15 @@ SetVarsForBoot() { TargetX64="bootx64.efi" TargetIA32="bootia32.efi" else - TargetX64="grubx64.efi" + if [[ $ShimType == "shim.efi" || $ShimType == "shimx64.efi" ]] ; then + TargetX64="grubx64.efi" + elif [[ $ShimType == "preloader.efi" || $ShimType == "PreLoader.efi" ]] ; then + TargetX64="loader.efi" + else + echo "Unknown shim/PreBootloader type: $ShimType" + echo "Aborting!" + exit 1 + fi TargetIA32="bootia32.efi" TargetShim="bootx64.efi" fi @@ -725,7 +746,15 @@ SetVarsForMsBoot() { if [[ $ShimSource == "none" ]] ; then TargetX64="bootmgfw.efi" else - TargetX64="grubx64.efi" + if [[ $ShimType == "shim.efi" || $ShimType == "shimx64.efi" ]] ; then + TargetX64="grubx64.efi" + elif [[ $ShimType == "preloader.efi" || $ShimType == "PreLoader.efi" ]] ; then + TargetX64="loader.efi" + else + echo "Unknown shim/PreBootloader type: $ShimType" + echo "Aborting!" + exit 1 + fi TargetShim="bootmgfw.efi" fi } diff --git a/refind.spec b/refind.spec index 34e3bfa..ab5edf0 100644 --- a/refind.spec +++ b/refind.spec @@ -1,6 +1,6 @@ Summary: EFI boot manager software Name: refind -Version: 0.6.11 +Version: 0.6.12 Release: 1%{?dist} Summary: EFI boot manager software License: GPLv3 @@ -127,6 +127,9 @@ cd /usr/share/refind-%{version} declare VarFile=`ls -d /sys/firmware/efi/vars/SecureBoot* 2> /dev/null` declare ShimFile=`find /boot -name shim\.efi 2> /dev/null | head -n 1` +if [[ ! -n $ShimFile ]] ; then + declare ShimFile=`find /boot -name PreLoader\.efi 2> /dev/null | head -n 1` +fi declare SBSign=`which sbsign 2> /dev/null` declare OpenSSL=`which openssl 2> /dev/null` @@ -154,5 +157,5 @@ fi # wiping out the just-updated files. %changelog -* Mon May 13 2013 R Smith