From 08c9041e9404458af750b30d60ae79843996c890 Mon Sep 17 00:00:00 2001
From: srs5694
Originally written: 3/14/2012; last Web page update: -5/5/2013, referencing rEFInd 0.6.10
+5/13/2013, referencing rEFInd 0.6.11I'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 62438d3..6b2e68c 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/5/2013, referencing rEFInd 0.6.10
+5/13/2013, referencing rEFInd 0.6.11I'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 bd77d9d..15ac439 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/5/2013, referencing rEFInd 0.6.10
+5/13/2013, referencing rEFInd 0.6.11I'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!
@@ -293,7 +293,7 @@ fs0: map -rSince the ext2fs and ReiserFS drivers share a common origin, it should come as no surprise that they perform in much the same way no matter which version (rEFIt, Clover, or rEFInd) you use. The NTFS driver from the Clover Tools package is nice and speedy, so if for some reason you need to place a boot loader on an NTFS volume, this driver might be worth tracking down.
-Although ext2fs, ext3fs, ext4fs, and ReiserFS are all case-sensitive, these drivers treat them in a case-insensitive way. Symbolic links work, which opens up possibilities for configuration, such as using a single kernel binary for multiple Linux distributions, with a link in one subdirectory pointing to a file in another directory. (If you try this, though, be sure to use relative links, as in ../otherdist/bzImage.efi, at least if the partition is not Linux's root filesystem.)
+Although ext2fs, ext3fs, ext4fs, and ReiserFS are all case-sensitive, these drivers treat them in a case-insensitive way. Symbolic links work; however, rEFInd 0.6.11 and later ignore symbolic links, since many distributions use them in a way that creates redundant or non-functional entries in the rEFInd menu. You should be able to use hard links if you want to use a single kernel file in multiple ways (say for two distributions).
diff --git a/docs/refind/features.html b/docs/refind/features.html index 44d09bd..818c72d 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/5/2013, referencing rEFInd 0.6.10
+5/13/2013, referencing rEFInd 0.6.11I'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/getting.html b/docs/refind/getting.html index 528fac4..5ff4f72 100644 --- a/docs/refind/getting.html +++ b/docs/refind/getting.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
+5/13/2013, referencing rEFInd 0.6.11I'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,7 +136,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
+5/13/2013, referencing rEFInd 0.6.11I'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!
@@ -152,7 +152,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
+5/13/2013, referencing rEFInd 0.6.11I'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!
@@ -206,11 +206,11 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.comBeginning with version 0.6.2, I've included RPM and Debian package files for rEFInd. If you have a working RPM-based or Debian-based Linux installation that boots in EFI mode, using one of these files is likely to be the easiest way to install rEFInd: You need only download the file and issue an appropriate installation command. In some cases, double-clicking the package in your file manager will install it. If that doesn't work, a command like the following will install the RPM on an RPM-based system:
-# rpm -Uvh refind-0.6.10-1.x86_64.rpm+
# rpm -Uvh refind-0.6.11-1.x86_64.rpm
On a Debian-based system, the equivalent command is:
-# dpkg -i refind_0.6.10-1_amd64.deb+
# dpkg -i refind_0.6.11-1_amd64.deb
Either command produces output similar to that described for using the install.sh script, so you can check it for error messages and other signs of trouble. The package file installs rEFInd and registers it with the EFI to be the default boot loader. The script that runs as part of the installation process tries to determine if you're using Secure Boot, and if so it will try to configure rEFInd to launch using shim; however, this won't work correctly on all systems. Ubuntu 12.10 users who are booting with Secure Boot active should be wary, since the resulting installation will probably try to use Ubuntu's version of shim, which won't work correctly with rEFInd.
diff --git a/docs/refind/linux.html b/docs/refind/linux.html index a69d36f..d886d36 100644 --- a/docs/refind/linux.html +++ b/docs/refind/linux.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.comOriginally written: 3/19/2012; last Web page update: -5/5/2013, referencing rEFInd 0.6.10
+5/13/2013, referencing rEFInd 0.6.11I'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/revisions.html b/docs/refind/revisions.html index 8454ff9..4377524 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/5/2013
+Last Web page update: 5/11/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/5/2013, referencing rEFInd 0.6.10
+5/13/2013, referencing rEFInd 0.6.11I'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 6bfdd40..771ab8d 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/5/2013, referencing rEFInd 0.6.10
+5/13/2013, referencing rEFInd 0.6.11I'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/using.html b/docs/refind/using.html index 7c1b0a7..60f98d1 100644 --- a/docs/refind/using.html +++ b/docs/refind/using.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
+5/13/2013, referencing rEFInd 0.6.11I'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/filesystems/fsw_efi.c b/filesystems/fsw_efi.c index 55709d4..057e7ad 100644 --- a/filesystems/fsw_efi.c +++ b/filesystems/fsw_efi.c @@ -98,7 +98,7 @@ EFI_GUID gEfiFileSystemVolumeLabelInfoIdGuid = EFI_FILE_SYSTEM_VOLUME_LABEL_INFO /** Helper macro for stringification. */ #define FSW_EFI_STRINGIFY(x) #x /** Expands to the EFI driver name given the file system type name. */ -#define FSW_EFI_DRIVER_NAME(t) L"rEFInd 0.6.10 " FSW_EFI_STRINGIFY(t) L" File System Driver" +#define FSW_EFI_DRIVER_NAME(t) L"rEFInd 0.6.11 " FSW_EFI_STRINGIFY(t) L" File System Driver" // function prototypes diff --git a/gptsync/gptsync.h b/gptsync/gptsync.h index 17150e2..fed07f0 100644 --- a/gptsync/gptsync.h +++ b/gptsync/gptsync.h @@ -35,7 +35,7 @@ */ /* Changes copyright (c) 2013 Roderick W. Smith */ -#define VERSION L"0.6.9" +#define VERSION L"0.6.11" // // config diff --git a/install.sh b/install.sh index 1d722e8..4edb69a 100755 --- a/install.sh +++ b/install.sh @@ -12,11 +12,14 @@ # "--usedefault {devicefile}" to install as default # (/EFI/BOOT/BOOTX64.EFI and similar) to the specified device # (/dev/sdd1 or whatever) without registering with the NVRAM. +# "--root {dir}" to specify installation using the specified directory +# as the system's root # "--alldrivers" to install all drivers along with regular files # "--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 # "--localkeys" to re-sign x86-64 binaries with a locally-generated key +# "--yes" to assume a "yes" response to all prompts # # The "esp" option is valid only on Mac OS X; it causes # installation to the EFI System Partition (ESP) rather than @@ -29,6 +32,8 @@ # # Revision history: # +# 0.6.11 -- Improvements in script's ability to handle directories with spaces +# in their names # 0.6.9 -- Install gptsync on Macs # 0.6.8 -- Bug fix: ESP scan now uses "uniq". # 0.6.6 -- Bug fix: Upgrade drivers when installed to EFI/BOOT. Also enable @@ -84,17 +89,17 @@ GetParams() { --esp | --ESP) InstallToEspOnMac=1 ;; --usedefault) TargetDir=/EFI/BOOT - TargetPart=$2 + TargetPart="$2" TargetX64="bootx64.efi" TargetIA32="bootia32.efi" shift ;; - --root) RootDir=$2 + --root) RootDir="$2" shift ;; --localkeys) LocalKeys=1 ;; - --shim) ShimSource=$2 + --shim) ShimSource="$2" shift ;; --drivers | --alldrivers) InstallDrivers="all" @@ -111,15 +116,15 @@ GetParams() { shift done - if [[ $InstallToEspOnMac == 1 && $TargetDir == '/EFI/BOOT' ]] ; then + if [[ $InstallToEspOnMac == 1 && "$TargetDir" == '/EFI/BOOT' ]] ; then echo "You may use --esp OR --usedefault, but not both! Aborting!" exit 1 fi - if [[ $RootDir != '/' && $TargetDir == '/EFI/BOOT' ]] ; then + if [[ "$RootDir" != '/' && "$TargetDir" == '/EFI/BOOT' ]] ; then echo "You may use --usedefault OR --root, but not both! Aborting!" exit 1 fi - if [[ $RootDir != '/' && $InstallToEspOnMac == 1 ]] ; then + if [[ "$RootDir" != '/' && $InstallToEspOnMac == 1 ]] ; then echo "You may use --root OR --esp, but not both! Aborting!" exit 1 fi @@ -149,33 +154,33 @@ CheckForFiles() { # is found, even on the wrong platform. This is because the platform # hasn't yet been determined. This could obviously be improved, but it # would mean restructuring lots more code.... - if [[ ! -f $RefindDir/refind_ia32.efi && ! -f $RefindDir/refind_x64.efi ]] ; then + if [[ ! -f "$RefindDir/refind_ia32.efi" && ! -f "$RefindDir/refind_x64.efi" ]] ; then echo "The rEFInd binary file is missing! Aborting installation!" exit 1 fi - if [[ -f $RefindDir/refind.conf-sample ]] ; then - ConfFile=$RefindDir/refind.conf-sample - elif [[ -f $ThisDir/refind.conf-sample ]] ; then - ConfFile=$ThisDir/refind.conf-sample + if [[ -f "$RefindDir/refind.conf-sample" ]] ; then + ConfFile="$RefindDir/refind.conf-sample" + elif [[ -f "$ThisDir/refind.conf-sample" ]] ; then + ConfFile="$ThisDir/refind.conf-sample" else echo "The sample configuration file is missing! Aborting installation!" exit 1 fi - if [[ -d $RefindDir/icons ]] ; then - IconsDir=$RefindDir/icons - elif [[ -d $ThisDir/icons ]] ; then - IconsDir=$ThisDir/icons + if [[ -d "$RefindDir/icons" ]] ; then + IconsDir="$RefindDir/icons" + elif [[ -d "$ThisDir/icons" ]] ; then + IconsDir="$ThisDir/icons" else echo "The icons directory is missing! Aborting installation!" exit 1 fi - if [[ $ShimSource != "none" ]] ; then - if [[ -f $ShimSource ]] ; then + if [[ "$ShimSource" != "none" ]] ; then + if [[ -f "$ShimSource" ]] ; then TargetX64="grubx64.efi" - MokManagerSource=`dirname $ShimSource`/MokManager.efi + MokManagerSource=`dirname "$ShimSource"`/MokManager.efi else echo "The specified shim file, $ShimSource, doesn't exist!" echo "Aborting installation!" @@ -187,12 +192,12 @@ CheckForFiles() { # Helper for CopyRefindFiles; copies shim files (including MokManager, if it's # available) to target. CopyShimFiles() { - cp -fb $ShimSource $InstallDir/$TargetDir/$TargetShim + cp -fb "$ShimSource" "$InstallDir/$TargetDir/$TargetShim" if [[ $? != 0 ]] ; then Problems=1 fi - if [[ -f $MokManagerSource ]] ; then - cp -fb $MokManagerSource $InstallDir/$TargetDir/ + if [[ -f "$MokManagerSource" ]] ; then + cp -fb "$MokManagerSource" "$InstallDir/$TargetDir/" fi if [[ $? != 0 ]] ; then Problems=1 @@ -202,12 +207,9 @@ CopyShimFiles() { # Copy the public keys to the installation medium CopyKeys() { if [[ $LocalKeys == 1 ]] ; then - mkdir -p $InstallDir/$TargetDir/keys/ - cp $EtcKeysDir/$LocalKeysBase.cer $InstallDir/$TargetDir/keys/ - cp $EtcKeysDir/$LocalKeysBase.crt $InstallDir/$TargetDir/keys/ -# else -# cp $ThisDir/refind.cer $InstallDir/$TargetDir/keys/ -# cp $ThisDir/refind.crt $InstallDir/$TargetDir/keys/ + mkdir -p "$InstallDir/$TargetDir/keys/" + cp "$EtcKeysDir/$LocalKeysBase.cer" "$InstallDir/$TargetDir/keys/" + cp "$EtcKeysDir/$LocalKeysBase.crt" "$InstallDir/$TargetDir/keys/" fi } # CopyKeys() @@ -216,10 +218,10 @@ CopyKeys() { # architecture code (ia32 or x64). CopyDrivers() { if [[ $InstallDrivers == "all" ]] ; then - mkdir -p $InstallDir/$TargetDir/drivers_$1 - cp $RefindDir/drivers_$1/*_$1.efi $InstallDir/$TargetDir/drivers_$1/ 2> /dev/null - cp $ThisDir/drivers_$1/*_$1.efi $InstallDir/$TargetDir/drivers_$1/ 2> /dev/null - elif [[ $InstallDrivers == "boot" && -x `which blkid` ]] ; then + mkdir -p "$InstallDir/$TargetDir/drivers_$1" + cp "$ThisDir"/drivers_$1/*_$1.efi "$InstallDir/$TargetDir/drivers_$1/" 2> /dev/null + cp "$RefindDir"/drivers_$1/*_$1.efi "$InstallDir/$TargetDir/drivers_$1/" 2> /dev/null + elif [[ "$InstallDrivers" == "boot" && -x `which blkid` ]] ; then BootPart=`df /boot | grep dev | cut -f 1 -d " "` BootFS=`blkid -o export $BootPart 2> /dev/null | grep TYPE= | cut -f 2 -d =` DriverType="" @@ -238,9 +240,9 @@ CopyDrivers() { esac if [[ -n $BootFS ]] ; then echo "Installing driver for $BootFS (${DriverType}_$1.efi)" - mkdir -p $InstallDir/$TargetDir/drivers_$1 - cp $RefindDir/drivers_$1/${DriverType}_$1.efi $InstallDir/$TargetDir/drivers_$1/ 2> /dev/null - cp $ThisDir/drivers_$1/${DriverType}_$1.efi $InstallDir/$TargetDir/drivers_$1/ 2> /dev/null + mkdir -p "$InstallDir/$TargetDir/drivers_$1" + cp "$ThisDir/drivers_$1/${DriverType}_$1.efi" "$InstallDir/$TargetDir/drivers_$1/" 2> /dev/null + cp "$RefindDir/drivers_$1/${DriverType}_$1.efi" "$InstallDir/$TargetDir/drivers_$1"/ 2> /dev/null fi fi } @@ -251,9 +253,9 @@ CopyDrivers() { CopyTools() { mkdir -p $InstallDir/EFI/tools if [[ $OSName == 'Darwin' ]] ; then - cp -f $RefindDir/tools_$1/gptsync_$1.efi $InstallDir/EFI/tools/ - if [[ -f $InstallDir/EFI/tools/gptsync.efi ]] ; then - mv $InstallDir/EFI/tools/gptsync.efi $InstallDir/EFI/tools/gptsync.efi-disabled + cp -f "$RefindDir/tools_$1/gptsync_$1.efi" "$InstallDir/EFI/tools/" + if [[ -f "$InstallDir/EFI/tools/gptsync.efi" ]] ; then + mv "$InstallDir/EFI/tools/gptsync.efi" "$InstallDir/EFI/tools/gptsync.efi-disabled" echo "Found old gptsync.efi; disabling it by renaming it to gptsync.efi-disabled" fi fi @@ -262,23 +264,23 @@ CopyTools() { # Copy the rEFInd files to the ESP or OS X root partition. # Sets Problems=1 if any critical commands fail. CopyRefindFiles() { - mkdir -p $InstallDir/$TargetDir - if [[ $TargetDir == '/EFI/BOOT' ]] ; then - cp $RefindDir/refind_ia32.efi $InstallDir/$TargetDir/$TargetIA32 2> /dev/null + mkdir -p "$InstallDir/$TargetDir" + if [[ "$TargetDir" == '/EFI/BOOT' ]] ; then + cp "$RefindDir/refind_ia32.efi" "$InstallDir/$TargetDir/$TargetIA32" 2> /dev/null if [[ $? != 0 ]] ; then echo "Note: IA32 (x86) binary not installed!" fi - cp $RefindDir/refind_x64.efi $InstallDir/$TargetDir/$TargetX64 2> /dev/null + cp "$RefindDir/refind_x64.efi" "$InstallDir/$TargetDir/$TargetX64" 2> /dev/null if [[ $? != 0 ]] ; then Problems=1 fi - if [[ $ShimSource != "none" ]] ; then + if [[ "$ShimSource" != "none" ]] ; then TargetShim="bootx64.efi" CopyShimFiles fi if [[ $InstallDrivers == "all" ]] ; then - cp -r $RefindDir/drivers_* $InstallDir/$TargetDir/ 2> /dev/null - cp -r $ThisDir/drivers_* $InstallDir/$TargetDir/ 2> /dev/null + 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 @@ -291,7 +293,7 @@ CopyRefindFiles() { Refind="" CopyKeys elif [[ $Platform == 'EFI64' || $TargetDir == "/EFI/Microsoft/Boot" ]] ; then - cp $RefindDir/refind_x64.efi $InstallDir/$TargetDir/$TargetX64 + cp "$RefindDir/refind_x64.efi" "$InstallDir/$TargetDir/$TargetX64" if [[ $? != 0 ]] ; then Problems=1 fi @@ -299,21 +301,21 @@ CopyRefindFiles() { CopyTools x64 Refind="refind_x64.efi" CopyKeys - if [[ $ShimSource != "none" ]] ; then - if [[ $TargetShim == "default" ]] ; then - TargetShim=`basename $ShimSource` + if [[ "$ShimSource" != "none" ]] ; then + if [[ "$TargetShim" == "default" ]] ; then + TargetShim=`basename "$ShimSource"` fi CopyShimFiles - Refind=$TargetShim + Refind="$TargetShim" if [[ $LocalKeys == 0 ]] ; then echo "Storing copies of rEFInd Secure Boot public keys in $EtcKeysDir" - mkdir -p $EtcKeysDir - cp $ThisDir/keys/refind.cer $EtcKeysDir 2> /dev/null - cp $ThisDir/keys/refind.crt $EtcKeysDir 2> /dev/null + mkdir -p "$EtcKeysDir" + cp "$ThisDir/keys/refind.cer" "$EtcKeysDir" 2> /dev/null + cp "$ThisDir/keys/refind.crt" "$EtcKeysDir" 2> /dev/null fi fi elif [[ $Platform == 'EFI32' ]] ; then - cp $RefindDir/refind_ia32.efi $InstallDir/$TargetDir/$TargetIA32 + cp "$RefindDir/refind_ia32.efi" "$InstallDir/$TargetDir/$TargetIA32" if [[ $? != 0 ]] ; then Problems=1 fi @@ -326,23 +328,23 @@ CopyRefindFiles() { fi echo "Copied rEFInd binary files" echo "" - if [[ -d $InstallDir/$TargetDir/icons ]] ; then - rm -rf $InstallDir/$TargetDir/icons-backup &> /dev/null - mv -f $InstallDir/$TargetDir/icons $InstallDir/$TargetDir/icons-backup + if [[ -d "$InstallDir/$TargetDir/icons" ]] ; then + rm -rf "$InstallDir/$TargetDir/icons-backup" &> /dev/null + mv -f "$InstallDir/$TargetDir/icons" "$InstallDir/$TargetDir/icons-backup" echo "Notice: Backed up existing icons directory as icons-backup." fi - cp -r $IconsDir $InstallDir/$TargetDir + cp -r "$IconsDir" "$InstallDir/$TargetDir" if [[ $? != 0 ]] ; then Problems=1 fi - mkdir -p $InstallDir/$TargetDir/keys - cp -rf $ThisDir/keys/*.[cd]er $InstallDir/$TargetDir/keys/ 2> /dev/null - cp -rf $EtcKeysDir/*.[cd]er $InstallDir/$TargetDir/keys/ 2> /dev/null - if [[ -f $InstallDir/$TargetDir/refind.conf ]] ; then + mkdir -p "$InstallDir/$TargetDir/keys" + cp -rf "$ThisDir"/keys/*.[cd]er "$InstallDir/$TargetDir/keys/" 2> /dev/null + cp -rf "$EtcKeysDir"/*.[cd]er "$InstallDir/$TargetDir/keys/" 2> /dev/null + if [[ -f "$InstallDir/$TargetDir/refind.conf" ]] ; then echo "Existing refind.conf file found; copying sample file as refind.conf-sample" echo "to avoid overwriting your customizations." echo "" - cp -f $ConfFile $InstallDir/$TargetDir + cp -f "$ConfFile" "$InstallDir/$TargetDir" if [[ $? != 0 ]] ; then Problems=1 fi @@ -350,29 +352,29 @@ CopyRefindFiles() { echo "Copying sample configuration file as refind.conf; edit this file to configure" echo "rEFInd." echo "" - cp -f $ConfFile $InstallDir/$TargetDir/refind.conf + cp -f "$ConfFile" "$InstallDir/$TargetDir/refind.conf" if [[ $? != 0 ]] ; then Problems=1 fi fi if [[ $DeleteRefindDir == 1 ]] ; then echo "Deleting the temporary directory $RefindDir" - rm -r $RefindDir + rm -r "$RefindDir" fi } # CopyRefindFiles() # Mount the partition the user specified with the --usedefault option MountDefaultTarget() { InstallDir=/tmp/refind_install - mkdir -p $InstallDir + mkdir -p "$InstallDir" if [[ $OSName == 'Darwin' ]] ; then - mount -t msdos $TargetPart $InstallDir + mount -t msdos "$TargetPart" "$InstallDir" elif [[ $OSName == 'Linux' ]] ; then - mount -t vfat $TargetPart $InstallDir + mount -t vfat "$TargetPart" "$InstallDir" fi if [[ $? != 0 ]] ; then echo "Couldn't mount $TargetPart ! Aborting!" - rmdir $InstallDir + rmdir "$InstallDir" exit 1 fi UnmountEsp=1 @@ -392,11 +394,11 @@ MountOSXESP() { Temp=`diskutil list | grep " EFI "` Esp=/dev/`echo $Temp | cut -f 5 -d ' '` # If the ESP is mounted, use its current mount point.... - Temp=`df | grep $Esp` + Temp=`df | grep "$Esp"` InstallDir=`echo $Temp | cut -f 6 -d ' '` - if [[ $InstallDir == '' ]] ; then + if [[ "$InstallDir" == '' ]] ; then mkdir /Volumes/ESP &> /dev/null - mount -t msdos $Esp /Volumes/ESP + mount -t msdos "$Esp" /Volumes/ESP if [[ $? != 0 ]] ; then echo "Unable to mount ESP! Aborting!\n" exit 1 @@ -410,20 +412,20 @@ MountOSXESP() { # Sets Problems=1 if problems found during the installation. InstallOnOSX() { echo "Installing rEFInd on OS X...." - if [[ $TargetDir == "/EFI/BOOT" ]] ; then + if [[ "$TargetDir" == "/EFI/BOOT" ]] ; then MountDefaultTarget - elif [[ $InstallToEspOnMac == "1" ]] ; then + elif [[ "$InstallToEspOnMac" == "1" ]] ; then MountOSXESP else InstallDir="$RootDir/" fi - echo "Installing rEFInd to the partition mounted at '$InstallDir'" + echo "Installing rEFInd to the partition mounted at $InstallDir" Platform=`ioreg -l -p IODeviceTree | grep firmware-abi | cut -d "\"" -f 4` CopyRefindFiles if [[ $InstallToEspOnMac == "1" ]] ; then - bless --mount $InstallDir --setBoot --file $InstallDir/$TargetDir/$Refind - elif [[ $TargetDir != "/EFI/BOOT" ]] ; then - bless --setBoot --folder $InstallDir/$TargetDir --file $InstallDir/$TargetDir/$Refind + bless --mount "$InstallDir" --setBoot --file "$InstallDir/$TargetDir/$Refind" + elif [[ "$TargetDir" != "/EFI/BOOT" ]] ; then + bless --setBoot --folder "$InstallDir/$TargetDir" --file "$InstallDir/$TargetDir/$Refind" fi if [[ $? != 0 ]] ; then Problems=1 @@ -465,7 +467,7 @@ InstallOnOSX() { # test can produce false alarms. A better test is highly desirable. CheckSecureBoot() { VarFile=`ls -d /sys/firmware/efi/vars/SecureBoot* 2> /dev/null` - if [[ -n $VarFile && $TargetDir != '/EFI/BOOT' && $ShimSource == "none" ]] ; then + if [[ -n "$VarFile" && "$TargetDir" != '/EFI/BOOT' && "$ShimSource" == "none" ]] ; then echo "" echo "CAUTION: Your computer appears to support Secure Boot, but you haven't" echo "specified a valid shim.efi file source. If you've disabled Secure Boot and" @@ -482,7 +484,7 @@ CheckSecureBoot() { fi fi - if [[ $ShimSource != "none" && ! -n $VarFile ]] ; then + if [[ "$ShimSource" != "none" && ! -n "$VarFile" ]] ; then echo "" echo "You've specified installing using a shim.efi file, but your computer does not" echo "appear to be running in Secure Boot mode. Although installing in this way" @@ -500,7 +502,7 @@ CheckSecureBoot() { fi fi - if [[ $LocalKeys != 0 && ! -n $VarFile ]] ; then + if [[ $LocalKeys != 0 && ! -n "$VarFile" ]] ; then echo "" echo "You've specified re-signing your rEFInd binaries with locally-generated keys," echo "but your computer does not appear to be running in Secure Boot mode. The" @@ -523,39 +525,39 @@ CheckSecureBoot() { # $EtcKeysDir (/etc/refind.d/keys). If they're not present, generate them using # openssl. GenerateKeys() { - PrivateKey=$EtcKeysDir/$LocalKeysBase.key - CertKey=$EtcKeysDir/$LocalKeysBase.crt - DerKey=$EtcKeysDir/$LocalKeysBase.cer + PrivateKey="$EtcKeysDir/$LocalKeysBase.key" + CertKey="$EtcKeysDir/$LocalKeysBase.crt" + DerKey="$EtcKeysDir/$LocalKeysBase.cer" OpenSSL=`which openssl 2> /dev/null` # Do the work only if one or more of the necessary keys is missing # TODO: Technically, we don't need the DerKey; but if it's missing and openssl # is also missing, this will fail. This could be improved. - if [[ ! -f $PrivateKey || ! -f $CertKey || ! -f $DerKey ]] ; then + if [[ ! -f "$PrivateKey" || ! -f "$CertKey" || ! -f "$DerKey" ]] ; then echo "Generating a fresh set of local keys...." - mkdir -p $EtcKeysDir - chmod 0700 $EtcKeysDir - if [[ ! -x $OpenSSL ]] ; then + mkdir -p "$EtcKeysDir" + chmod 0700 "$EtcKeysDir" + if [[ ! -x "$OpenSSL" ]] ; then echo "Can't find openssl, which is required to create your private signing keys!" echo "Aborting!" exit 1 fi - if [[ -f $PrivateKey ]] ; then + if [[ -f "$PrivateKey" ]] ; then echo "Backing up existing $PrivateKey" - cp -f $PrivateKey $PrivateKey.backup 2> /dev/null + cp -f "$PrivateKey" "$PrivateKey.backup" 2> /dev/null fi - if [[ -f $CertKey ]] ; then + if [[ -f "$CertKey" ]] ; then echo "Backing up existing $CertKey" - cp -f $CertKey $CertKey.backup 2> /dev/null + cp -f "$CertKey" "$CertKey.backup" 2> /dev/null fi - if [[ -f $DerKey ]] ; then + if [[ -f "$DerKey" ]] ; then echo "Backing up existing $DerKey" - cp -f $DerKey $DerKey.backup 2> /dev/null + cp -f "$DerKey" "$DerKey.backup" 2> /dev/null fi - $OpenSSL req -new -x509 -newkey rsa:2048 -keyout $PrivateKey -out $CertKey \ - -nodes -days 3650 -subj "/CN=Locally-generated rEFInd key/" - $OpenSSL x509 -in $CertKey -out $DerKey -outform DER - chmod 0600 $PrivateKey + "$OpenSSL" req -new -x509 -newkey rsa:2048 -keyout "$PrivateKey" -out "$CertKey" \ + -nodes -days 3650 -subj "/CN=Locally-generated rEFInd key/" + "$OpenSSL" x509 -in "$CertKey" -out "$DerKey" -outform DER + chmod 0600 "$PrivateKey" else echo "Using existing local keys...." fi @@ -568,7 +570,7 @@ GenerateKeys() { # appropriately. # Aborts script on error SignOneBinary() { - $SBSign --key $PrivateKey --cert $CertKey --output $2 $1 + $SBSign --key "$PrivateKey" --cert "$CertKey" --output "$2" "$1" if [[ $? != 0 ]] ; then echo "Problem signing the binary $1! Aborting!" exit 1 @@ -582,24 +584,27 @@ ReSignBinaries() { SBSign=`which sbsign 2> /dev/null` echo "Found sbsign at $SBSign" TempDir="/tmp/refind_local" - if [[ ! -x $SBSign ]] ; then + if [[ ! -x "$SBSign" ]] ; then echo "Can't find sbsign, which is required to sign rEFInd with your own keys!" echo "Aborting!" exit 1 fi GenerateKeys - mkdir -p $TempDir/drivers_x64 - cp $RefindDir/refind.conf-sample $TempDir 2> /dev/null - cp $ThisDir/refind.conf-sample $TempDir 2> /dev/null - cp $RefindDir/refind_ia32.efi $TempDir 2> /dev/null - cp -a $RefindDir/drivers_ia32 $TempDir 2> /dev/null - cp -a $ThisDir/drivers_ia32 $TempDir 2> /dev/null - SignOneBinary $RefindDir/refind_x64.efi $TempDir/refind_x64.efi - for Driver in `ls $RefindDir/drivers_x64/*.efi $ThisDir/drivers_x64/*.efi 2> /dev/null` ; do - TempName=`basename $Driver` - SignOneBinary $Driver $TempDir/drivers_x64/$TempName + mkdir -p "$TempDir/drivers_x64" + cp "$RefindDir/refind.conf-sample $TempDir" 2> /dev/null + cp "$ThisDir/refind.conf-sample $TempDir" 2> /dev/null + cp "$RefindDir/refind_ia32.efi $TempDir" 2> /dev/null + cp -a "$RefindDir/drivers_ia32 $TempDir" 2> /dev/null + cp -a "$ThisDir/drivers_ia32 $TempDir" 2> /dev/null + SignOneBinary "$RefindDir/refind_x64.efi" "$TempDir/refind_x64.efi" + SaveIFS=$IFS + IFS=$(echo -en "\n\b") + for Driver in `ls "$RefindDir"/drivers_x64/*.efi "$ThisDir"/drivers_x64/*.efi 2> /dev/null` ; do + TempName=`basename "$Driver"` + SignOneBinary "$Driver" "$TempDir/drivers_x64/$TempName" done - RefindDir=$TempDir + IFS=$SaveIFS + RefindDir="$TempDir" DeleteRefindDir=1 } @@ -608,14 +613,15 @@ ReSignBinaries() { # either location. # Sets InstallDir to the ESP mount point. FindLinuxESP() { - EspLine=`df $RootDir/boot/efi 2> /dev/null | grep boot/efi` - if [[ ! -n $EspLine ]] ; then - EspLine=`df $RootDir/boot | grep boot` + EspLine=`df "$RootDir/boot/efi" 2> /dev/null | grep boot/efi` + if [[ ! -n "$EspLine" ]] ; then + EspLine=`df "$RootDir"/boot | grep boot` fi InstallDir=`echo $EspLine | cut -d " " -f 6` - if [[ -n $InstallDir ]] ; then - EspFilesystem=`grep $InstallDir /etc/mtab | uniq | cut -d " " -f 3` + if [[ -n "$InstallDir" ]] ; then + EspFilesystem=`grep "$InstallDir" /etc/mtab | uniq | 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!" @@ -629,23 +635,23 @@ FindLinuxESP() { AddBootEntry() { InstallIt="0" Efibootmgr=`which efibootmgr 2> /dev/null` - if [[ $Efibootmgr ]] ; then - InstallDisk=`grep $InstallDir /etc/mtab | cut -d " " -f 1 | cut -c 1-8` - PartNum=`grep $InstallDir /etc/mtab | cut -d " " -f 1 | cut -c 9-10` - EntryFilename=$TargetDir/$Refind + if [[ "$Efibootmgr" ]] ; then + InstallDisk=`grep "$InstallDir" /etc/mtab | cut -d " " -f 1 | cut -c 1-8` + PartNum=`grep "$InstallDir" /etc/mtab | cut -d " " -f 1 | cut -c 9-10` + EntryFilename="$TargetDir/$Refind" EfiEntryFilename=`echo ${EntryFilename//\//\\\}` EfiEntryFilename2=`echo ${EfiEntryFilename} | sed s/\\\\\\\\/\\\\\\\\\\\\\\\\/g` - ExistingEntry=`$Efibootmgr -v | grep -i $EfiEntryFilename2` + ExistingEntry=`"$Efibootmgr" -v | grep -i "$EfiEntryFilename2"` - if [[ $ExistingEntry ]] ; then - ExistingEntryBootNum=`echo $ExistingEntry | cut -c 5-8` - FirstBoot=`$Efibootmgr | grep BootOrder | cut -c 12-15` - if [[ $ExistingEntryBootNum != $FirstBoot ]] ; then + if [[ "$ExistingEntry" ]] ; then + ExistingEntryBootNum=`echo "$ExistingEntry" | cut -c 5-8` + FirstBoot=`"$Efibootmgr" | grep BootOrder | cut -c 12-15` + if [[ "$ExistingEntryBootNum" != "$FirstBoot" ]] ; then echo "An existing rEFInd boot entry exists, but isn't set as the default boot" echo "manager. The boot order is being adjusted to make rEFInd the default boot" echo "manager. If this is NOT what you want, you should use efibootmgr to" echo "manually adjust your EFI's boot order." - $Efibootmgr -b $ExistingEntryBootNum -B &> /dev/null + "$Efibootmgr" -b $ExistingEntryBootNum -B &> /dev/null InstallIt="1" fi else @@ -654,7 +660,7 @@ AddBootEntry() { if [[ $InstallIt == "1" ]] ; then echo "Installing it!" - $Efibootmgr -c -l $EfiEntryFilename -L "rEFInd Boot Manager" -d $InstallDisk -p $PartNum &> /dev/null + "$Efibootmgr" -c -l "$EfiEntryFilename" -L "rEFInd Boot Manager" -d $InstallDisk -p $PartNum &> /dev/null if [[ $? != 0 ]] ; then EfibootmgrProblems=1 Problems=1 @@ -677,20 +683,20 @@ AddBootEntry() { # Create a minimal/sample refind_linux.conf file in /boot. GenerateRefindLinuxConf() { - if [[ -f $RLConfFile ]] ; then + if [[ -f "$RLConfFile" ]] ; then echo "Existing $RLConfFile found; not overwriting." else if [[ -f "$RootDir/etc/default/grub" ]] ; then # We want the default options used by the distribution, stored here.... source "$RootDir/etc/default/grub" fi - RootFS=`df $RootDir | grep dev | cut -f 1 -d " "` - StartOfDevname=`echo $RootFS | cut -b 1-7` - if [[ $StartOfDevname == "/dev/sd" || $StartOfDevName == "/dev/hd" ]] ; then + RootFS=`df "$RootDir" | grep dev | cut -f 1 -d " "` + StartOfDevname=`echo "$RootFS" | cut -b 1-7` + if [[ "$StartOfDevname" == "/dev/sd" || "$StartOfDevName" == "/dev/hd" ]] ; then # Identify root filesystem by UUID rather than by device node, if possible - Uuid=`blkid -o export $RootFS 2> /dev/null | grep UUID=` + Uuid=`blkid -o export "$RootFS" 2> /dev/null | grep UUID=` if [[ -n $Uuid ]] ; then - RootFS=$Uuid + RootFS="$Uuid" fi fi DefaultOptions="$GRUB_CMDLINE_LINUX $GRUB_CMDLINE_LINUX_DEFAULT" @@ -753,21 +759,21 @@ DetermineTargetDir() { fi if [[ ! -d /sys/firmware/efi && $Upgrade == 0 ]] ; then # BIOS-mode - FoundEfiFiles=`find $InstallDir/EFI/BOOT -name "*.efi" 2> /dev/null` - FoundConfFiles=`find $InstallDir -name "refind\.conf" 2> /dev/null` - if [[ ! -n $FoundConfFiles && -f $InstallDir/EFI/Microsoft/Boot/bootmgfw.efi ]] ; then - mv -n $InstallDir/EFI/Microsoft/Boot/bootmgfw.efi $InstallDir/EFI/Microsoft &> /dev/null + FoundEfiFiles=`find "$InstallDir/EFI/BOOT" -name "*.efi" 2> /dev/null` + FoundConfFiles=`find "$InstallDir" -name "refind\.conf" 2> /dev/null` + if [[ ! -n "$FoundConfFiles" && -f "$InstallDir/EFI/Microsoft/Boot/bootmgfw.efi" ]] ; then + mv -n "$InstallDir/EFI/Microsoft/Boot/bootmgfw.efi" "$InstallDir/EFI/Microsoft" &> /dev/null SetVarsForMsBoot echo "Running in BIOS mode with a suspected Windows installation; moving boot loader" echo "files so as to install to $InstallDir$TargetDir." - elif [[ ! -n $FoundEfiFiles ]] ; then # In BIOS mode and no default loader; install as default loader + elif [[ ! -n "$FoundEfiFiles" ]] ; then # In BIOS mode and no default loader; install as default loader SetVarsForBoot echo "Running in BIOS mode with no existing default boot loader; installing to" echo $InstallDir$TargetDir else echo "Running in BIOS mode with an existing default boot loader; backing it up and" echo "installing rEFInd in its place." - if [[ -d $InstallDir/EFI/BOOT-rEFIndBackup ]] ; then + if [[ -d "$InstallDir/EFI/BOOT-rEFIndBackup" ]] ; then echo "" echo "Caution: An existing backup of a default boot loader exists! If the current" echo "default boot loader and the backup are different boot loaders, the current" @@ -781,7 +787,7 @@ DetermineTargetDir() { exit 0 fi fi - mv -n $InstallDir/EFI/BOOT $InstallDir/EFI/BOOT-rEFIndBackup + mv -n "$InstallDir/EFI/BOOT" "$InstallDir/EFI/BOOT-rEFIndBackup" SetVarsForBoot fi fi # BIOS-mode @@ -807,10 +813,10 @@ InstallOnLinux() { # abort. Not in BIOS mode, though, since that could be used on an emergency # disc to try to recover a troubled Linux installation. if [[ -d /sys/firmware/efi ]] ; then - if [[ $ShimSource != "none" && $TargetDir != "/BOOT/EFI" ]] ; then + if [[ "$ShimSource" != "none" && "$TargetDir" != "/BOOT/EFI" ]] ; then echo "" - echo "CAUTION: Neither rEFInd nor shim currently supports 32-bit systems, so you" - echo "should not use the --shim option to install on such systems. Aborting!" + echo "CAUTION: shim does not currently supports 32-bit systems, so you should not" + echo "use the --shim option to install on such systems. Aborting!" echo "" exit 1 fi @@ -841,7 +847,7 @@ InstallOnLinux() { CheckSecureBoot CopyRefindFiles - if [[ $TargetDir != "/EFI/BOOT" && $TargetDir != "/EFI/Microsoft/Boot" ]] ; then + if [[ "$TargetDir" != "/EFI/BOOT" && "$TargetDir" != "/EFI/Microsoft/Boot" ]] ; then AddBootEntry GenerateRefindLinuxConf fi @@ -854,13 +860,13 @@ InstallOnLinux() { # OSName=`uname -s` -GetParams $@ +GetParams "$@" ThisDir="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" RefindDir="$ThisDir/refind" ThisScript="$ThisDir/`basename $0`" if [[ `whoami` != "root" ]] ; then echo "Not running as root; attempting to elevate privileges via sudo...." - sudo $ThisScript "$@" + sudo "$ThisScript" "$@" if [[ $? != 0 ]] ; then echo "This script must be run as root (or using sudo). Exiting!" exit 1 @@ -870,11 +876,11 @@ if [[ `whoami` != "root" ]] ; then fi CheckForFiles if [[ $OSName == 'Darwin' ]] ; then - if [[ $ShimSource != "none" ]] ; then + if [[ "$ShimSource" != "none" ]] ; then echo "The --shim option is not supported on OS X! Exiting!" exit 1 fi - if [[ $LocalKeys != 0 ]] ; then + if [[ "$LocalKeys" != 0 ]] ; then echo "The --localkeys option is not supported on OS X! Exiting!" exit 1 fi @@ -903,7 +909,7 @@ if [[ $UnmountEsp ]] ; then umount $InstallDir fi -if [[ $InstallDir == /tmp/refind_install ]] ; then +if [[ "$InstallDir" == /tmp/refind_install ]] ; then # sleep 5 - rmdir $InstallDir + rmdir "$InstallDir" fi diff --git a/refind.spec b/refind.spec index 2e4d392..34e3bfa 100644 --- a/refind.spec +++ b/refind.spec @@ -1,6 +1,6 @@ Summary: EFI boot manager software Name: refind -Version: 0.6.10 +Version: 0.6.11 Release: 1%{?dist} Summary: EFI boot manager software License: GPLv3 @@ -154,5 +154,5 @@ fi # wiping out the just-updated files. %changelog -* Sun Feb 3 2013 R Smith