From: srs5694 Date: Mon, 6 May 2013 01:36:58 +0000 (-0400) Subject: 0.6.10 release; adds screen saver code. X-Git-Url: https://code.delx.au/refind/commitdiff_plain/4f05f12b4a34cfbef8deb341168a212edb225ad4 0.6.10 release; adds screen saver code. --- diff --git a/Make.common b/Make.common index 0d994e5..7127fdf 100644 --- a/Make.common +++ b/Make.common @@ -3,16 +3,16 @@ # Common make rules for building with gnu-efi # -EFIINC = /usr/include/efi -GNUEFILIB = /usr/lib64 -EFILIB = /usr/lib64 -EFICRT0 = /usr/lib64 +#EFIINC = /usr/include/efi +#GNUEFILIB = /usr/lib64 +#EFILIB = /usr/lib64 +#EFICRT0 = /usr/lib64 # Comment out above and uncomment below if using locally-compiled GNU-EFI.... -#EFIINC = /usr/local/include/efi -#GNUEFILIB = /usr/local/lib -#EFILIB = /usr/local/lib -#EFICRT0 = /usr/local/lib +EFIINC = /usr/local/include/efi +GNUEFILIB = /usr/local/lib +EFILIB = /usr/local/lib +EFICRT0 = /usr/local/lib HOSTARCH = $(shell uname -m | sed s,i[3456789]86,ia32,) ARCH := $(HOSTARCH) diff --git a/NEWS.txt b/NEWS.txt index 68e771c..a72a1bc 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,8 +1,13 @@ -0.6.10 (?/??/2013): -------------------- +0.6.10 (5/5/2013): +------------------ + +- Added support for "screensaver" token. If set to a positive integer, this + causes the screen to blank after the specified number of seconds of + inactivity. Pressing most keys (unfortunately NOT including Shift, Alt, + or Ctrl) will restore the display and restart the screen saver timeout. - Added icon for ChromeOS (os_chrome.icns in the icons subdirectory). - ChromeOS reportedly boots using the fallback filename, but if a user + ChromeBooks reportedly boots using the fallback filename, but if a user wants to install rEFInd on a ChromeBook, renaming the original EFI/BOOT directory to EFI/chrome and then installing rEFInd in the fallback filename will bring up this new icon for ChromeOS. diff --git a/docs/refind/bootmode.html b/docs/refind/bootmode.html index b4dcf5f..0d80c83 100644 --- a/docs/refind/bootmode.html +++ b/docs/refind/bootmode.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

Originally written: 3/14/2012; last Web page update: -4/25/2013, referencing rEFInd 0.6.9

+5/5/2013, referencing rEFInd 0.6.10

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!

diff --git a/docs/refind/configfile.html b/docs/refind/configfile.html index 73c0ca7..a8dcb59 100644 --- a/docs/refind/configfile.html +++ b/docs/refind/configfile.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

Originally written: 3/14/2012; last Web page update: -4/25/2013, referencing rEFInd 0.6.9

+5/5/2013, referencing rEFInd 0.6.10

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!

@@ -211,6 +211,11 @@ timeout 20 numeric value Sets the timeout period in seconds. If 0, the timeout is disabled—rEFInd waits indefinitely for user input. + + screensaver + numeric value + Sets the number of seconds of inactivity before the screen blanks to prevent burn-in. The display returns after most keypresses (unfortunately, not including modifiers such as Shift, Control, Alt, or Option). The default is 0, which disables this feature. + hideui banner, label, singleuser, safemode, hwtest, arrows, hints, editor, or all diff --git a/docs/refind/drivers.html b/docs/refind/drivers.html index 39003fa..bd77d9d 100644 --- a/docs/refind/drivers.html +++ b/docs/refind/drivers.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

Originally written: 4/19/2012; last Web page update: -4/25/2013, referencing rEFInd 0.6.9

+5/5/2013, referencing rEFInd 0.6.10

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!

diff --git a/docs/refind/features.html b/docs/refind/features.html index f5a708b..44d09bd 100644 --- a/docs/refind/features.html +++ b/docs/refind/features.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

Originally written: 3/14/2012; last Web page update: -4/25/2013, referencing rEFInd 0.6.9

+5/5/2013, referencing rEFInd 0.6.10

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!

@@ -207,6 +207,8 @@ lack a usable CSM.
  • Fixes to display problems on many UEFI-based PCs.
    • +
  • Beginning with version 0.6.10, a screen saver feature, activated by the screensaver seconds token in refind.conf: Set seconds to the number of seconds before the screen will blank to prevent burn-in.
    • +
  • Workarounds to file detection bugs in at least one type of UEFI firmware.
  • Improved detection of itself, to keep rEFInd out of its own boot menu.
    • diff --git a/docs/refind/getting.html b/docs/refind/getting.html index c3cb9bf..528fac4 100644 --- a/docs/refind/getting.html +++ b/docs/refind/getting.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    Originally written: 3/14/2012; last Web page update: -4/25/2013, referencing rEFInd 0.6.9

    +5/5/2013, referencing rEFInd 0.6.10

    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!

    @@ -136,7 +136,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

  • Additional programs diff --git a/docs/refind/installing.html b/docs/refind/installing.html index db34db9..d3b5424 100644 --- a/docs/refind/installing.html +++ b/docs/refind/installing.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    Originally written: 3/14/2012; last Web page update: -4/25/2013, referencing rEFInd 0.6.9

    +5/5/2013, referencing rEFInd 0.6.10

    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.com

    +

    Don't be scared by the length of this page! Only portions of this page apply to any given user, and most people can install rEFInd from an RPM or Debian package in a matter of seconds or by using the install.sh script in minute or two.

    +

    Once you've obtained a rEFInd binary file, you must install it to your computer's ESP (or conceivably to some other location). The details of how you do this depend on your OS and your computer (UEFI-based PC vs. Macintosh). The upcoming sections provide details. See the Contents sidebar to the left for links to specific installation procedures. For most Linux users, an RPM or Debian package is the best way to go. If your Linux system doesn't support these formats, though, or if you're running OS X, using the install.sh script can be a good way to go. If you're using Windows, you'll have to install manually.

    Important: A rEFInd zip file, when uncompressed, creates a directory called refind-version, where version is the version number. This directory includes a subdirectory called refind that holds the boot loader, along with another that holds documentation, as well as miscellaneous files in refind-version itself. When I refer to "the refind directory" on this page, I mean the directory with that precise name, not the refind-version directory that is its parent.

    @@ -204,11 +206,11 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    Beginning 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.9-1.x86_64.rpm
    +
    # rpm -Uvh refind-0.6.10-1.x86_64.rpm

    On a Debian-based system, the equivalent command is:

    -
    # dpkg -i refind_0.6.9-1_amd64.deb
    +
    # dpkg -i refind_0.6.10-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 d54f151..a69d36f 100644 --- a/docs/refind/linux.html +++ b/docs/refind/linux.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    Originally written: 3/19/2012; last Web page update: -4/25/2013, referencing rEFInd 0.6.9

    +5/5/2013, referencing rEFInd 0.6.10

    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!

    diff --git a/docs/refind/revisions.html b/docs/refind/revisions.html index 6f96584..8454ff9 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: 4/25/2013

    +

    Last Web page update: 5/5/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.com

      +
    • 0.6.10 (5/5/2013)—This version adds a number of minor improvements: The ability to create multiple screen shots under a sequence of names rather than using just one name; a new screen saver feature, activated by the screensaver token in refind.conf; and an option to reboot the computer into the firmware's setup utility on computers that support this feature. I've also added an OS for ChromeOS (os_chrome.icns), and I've updated the LodePNG library to the latest version, which might improve rendering of some PNG files.
      • +
    • 0.6.9 (4/25/2013)—The most visible change to this version is to the rEFInd banner image, which now includes an icon provided by Erik Kemperman. The biggest change with this version is the inclusion of an updated version of gptsync, which is popular on Macs as a means of maintaining the hybrid MBR that's required to boot Windows in BIOS mode on that platform. Because hybrid MBRs are ugly and dangerous, though, the rEFInd install.sh script installs the program only under OS X, and even then it must be activated by uncommending the scanfor line in refind.conf and adding gptsync to its options list. If you want to use gptsync on a PC, you can, but you'll need to copy the program file manually to the ESP's EFI/tools directory. Other changes with this version include working around a suspected firmware bug that can cause hangs when rEFInd starts on some systems and changing the timeout code so that rEFInd will launch its default OS even if the computer is started without a keyboard.
    • 0.6.8 (3/18/2013)—This version fixes a few obscure bugs but adds only one minor new feature. Most notably, it fixes a problem that caused "Invalid Parameter" errors to appear when scanning for boot loaders on some systems; fixes a bug that caused icons defined in files named after boot loaders to not appear; and fixes a bug in the install.sh script that caused the script to fail on some systems. It also enables you to name a shell shell.efi in the root directory (previously only shell_arch.efi worked in the root directory, although shell.efi worked in the EFI/tools directory).
      • diff --git a/docs/refind/secureboot.html b/docs/refind/secureboot.html index f625116..4f863cc 100644 --- a/docs/refind/secureboot.html +++ b/docs/refind/secureboot.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

      Originally written: 11/13/2012; last Web page update: -4/25/2013, referencing rEFInd 0.6.9

      +5/5/2013, referencing rEFInd 0.6.10

      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!

      @@ -138,9 +138,13 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    • Basic Issues
      • -
    • Installation Issues
      • +
    • Using rEFInd with Shim
      • + -
    • Managing Your MOKs
      • +
    • Using rEFInd with PreBootloader
    • Secure Boot Caveats
      • @@ -148,7 +152,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    -

    If you're using a computer that supports Secure Boot, you may run into extra complications. This feature is intended to make it difficult for malware to insert itself early into the computer's boot process. Unfortunately, it also complicates multi-boot configurations such as those that rEFInd is intended to manage. This page describes some secure boot basics and two specific aspects of rEFInd and its interactions with Secure Boot: installation issues and MOK management. It concludes with a look at known bugs and limitations in rEFInd's Secure Boot features.

    +

    If you're using a computer that supports Secure Boot, you may run into extra complications. This feature is intended to make it difficult for malware to insert itself early into the computer's boot process. Unfortunately, it also complicates multi-boot configurations such as those that rEFInd is intended to manage. This page describes some secure boot basics and two specific ways of using rEFInd with Secure Boot: Using the shim program and using the PreBootloader program. It concludes with a look at known bugs and limitations in rEFInd's Secure Boot features.

    Basic Issues

    @@ -158,15 +162,13 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    If you don't want it, you can disable it, at least on x86-64 PCs. If an ARM-based computer ships with -Windows 8, this isn't an option for it. Unfortunately, the shim software -described on this page currently supports only x86-64, not -x86 or ARM.

    +Windows 8, this isn't an option for it. Unfortunately, the shim and PreBootloader programs described on this page currently support only x86-64, not x86 or ARM.

    Through 2012, it became obvious that Secure Boot would be a feature that was controlled, to a large extent, by Microsoft. This is because Microsoft requires that non-server computers that display Windows 8 logos ship with Secure Boot enabled. As a practical matter, this also means that such computers ship with Microsoft's keys in their firmware. In the absence of an industry-standard body to manage the signing of Secure Boot keys, this means that Microsoft's key is the only one that's more-or-less guaranteed to be installed on the computer, thus blocking the ability to boot any OS that lacks a boot path through Microsoft's signing key.

    -

    Note: The Linux Foundation has released a signed version of their PreBootloader, which functions something like shim; however, where shim requires signing all binaries that don't already have valid Secure Boot keys and managing a small number of keys, PreBootloader requires registering every authorized binary. I haven't had the chance to revise this documentation to cover PreBootloader, but you may want to use it instead of shim if you want to manage a small number of binaries that are not already signed with a Secure Boot key, MOK, or a key built into a signed version of shim.

    +

    Fortunately, Microsoft will sign third-party binaries with their key—or more precisely, with a key that Microsoft uses to sign third-party binaries. (Microsoft uses another key to sign its own binaries, and some devices, such as the Microsoft Surface tablet, lack the third-party Microsoft key.) A payment of $99 to Verisign enables a software distributor to sign as many binaries as desired. Red Hat (Fedora), Novell (SUSE), and Canonical (Ubuntu) are all using this system to enable their boot loaders to run. Unfortunately, using a third-party signing service is an awkward solution for open source software. In fact, for this very reason two separate programs exist that shift the Secure Boot "train" from Microsoft's proprietary "track" to one that's more friendly to open source authors. Both of these programs (shim and PreBootloader) are available in binary form signed by Microsoft's key. Shim enables the computer to launch binaries that are signed by a key that's built into it or that the user adds to a list known as the Machine Owner Key (MOK) list. PreBootloader enables the computer to launch binaries that the user has explicitly identified as being OK. Distributions beginning with Ubuntu 12.10 (and 12.04.2), Fedora 18, and OpenSUSE 12.3 use shim, although Ubuntu ships with an early version of shim that's useless for launching rEFInd, at least through Ubuntu 13.04. To the best of my knowledge, no major distribution uses PreBootloader, but it may see use on live CDs and is easier to set up if you're not using a distribution that supports shim.

    -

    Fortunately, Microsoft will sign third-party binaries with their key—or more precisely, with a key that Microsoft uses to sign third-party binaries. (Microsoft uses another key to sign its own binaries, and some devices, such as the Microsoft Surface tablet, lack the third-party Microsoft key.) A payment of $99 to Verisign enables a software distributor to sign as many binaries as desired. Red Hat (Fedora), Novell (SUSE), and Canonical (Ubuntu) have all announced plans to take advantage of this system. Unfortunately, using a third-party signing service is an awkward solution for open source software. In fact, for this very reason Red Hat has developed a program that it calls shim that essentially shifts the Secure Boot "train" from Microsoft's proprietary "track" to one that's more friendly to open source authors. Shim is signed by Microsoft and redirects the boot process to another boot loader that can be signed with keys that the distribution maintains and that are built into shim. Fedora 18 also uses this system. SUSE has announced that it will use the same system, as does Ubuntu with version 12.10 and later. SUSE has contributed to the shim approach by providing expansions to shim that support a set of keys that users can maintain themselves. These keys are known as Machine Owner Keys (MOKs), and managing them is described later, in Managing MOKs. To reiterate, then, there are potentially three ways to sign a binary that will get it launched on a computer that uses shim:

    +

    There are three ways to sign a binary that will get it launched on a computer that uses shim:

    -

    All three key types are the same in form—shim's built-in keys and MOKs are both generated using the same tools used to generate Secure Boot keys. The keys can be generated with the common openssl program, but signing EFI binaries requires a rarer program called sbsign or pesign. Although it's theoretically possible to use rEFInd without signing your own binaries, this is not yet practical, because distributions don't yet provide their own signed binaries or the public MOK files you must have to enroll their keys. With any luck this will change in 2013. At the very least, many distributions will begin supporting Secure Boot in the near future, and with any luck they'll include their public MOKs for use with other distributions' versions of shim.

    +

    All three key types are the same in form—shim's built-in keys and MOKs are both generated using the same tools used to generate Secure Boot keys. The keys can be generated with the common openssl program, but signing EFI binaries requires a rarer program called sbsign or pesign. If you use shim with a distribution that doesn't support this tool, you'll need to either sign the kernels yourself, which can be a hassle, or launch the kernels by way of a boot loader that doesn't check for signatures, such as ELILO.

    -

    Because shim and MOK are being supported by several of the major players in the Linux world, I've decided to do the same with rEFInd. Beginning with version 0.5.0, rEFInd can communicate with the shim system to authenticate boot loaders. If a boot loader has been signed by a valid UEFI Secure Boot key, a valid shim key, or a valid MOK key, rEFInd will launch it. rEFInd will also launch unsigned boot loaders or those with invalid signatures if Secure Boot is disabled in or unsupported by the firmware. (If that's your situation, you needn't bother reading this page.)

    +

    Shim's author is working on merging it and PreBootloader. Thus, future versions of shim may provide the advantages of both programs.

    -

    Version 0.5.0 ships signed with my own keys, and I provide the public version of this key with the rEFInd package. This can help simplify setup, since you needn't generate your own keys to get rEFInd working; however, without public keys for the boot loaders that rEFInd launches, you'll still need to generate keys and sign your boot loaders, as described in the Managing Your MOKs section.

    +

    PreBootloader is easier to set up on a distribution that doesn't support shim because PreBootloader doesn't rely on keys; instead, you tell it which binaries you trust and it will let you launch them. This works well on a system with boot managers, boot loaders, and kernels that seldom change. It's not a good solution for distribution maintainers, though, because it requires that users manually add binaries to PreBootloader's list of approved binaries when the OS is installed and every time those binaries change. Also, PreBootloader relies on a helper program, HashTool, to enroll hashes. (This is Geek for "tell the computer that a binary is OK.") Unfortunately, HashTool can enroll hashes only from the partition from which it was launched, so if you want to use rEFInd to launch Linux kernels directly, it's easiest if you mount your ESP at /boot in Linux or copy your kernels to the ESP. Another approach is to copy HashTool.efi to the partition that holds your kernel and rename it to almost anything else. rEFInd will then treat it like an OS boot loader and create a menu entry for it, enabling you to launch it as needed.

    + +

    Beginning with version 0.5.0, rEFInd can communicate with the shim system to authenticate boot loaders. If a boot loader has been signed by a valid UEFI Secure Boot key, a valid shim key, or a valid MOK key, rEFInd will launch it. rEFInd will also launch unsigned boot loaders or those with invalid signatures if Secure Boot is disabled in or unsupported by the firmware. (If that's your situation, you needn't bother reading this page.) PreBootloader is designed in such a way that it requires no explicit support in rEFInd to work.

    + +

    Version 0.5.0 ships signed with my own keys, and I provide the public version of this key with the rEFInd package. This can help simplify setup, since you needn't generate your own keys to get rEFInd working; however, if you lack public keys for the boot loaders that rEFInd launches, you'll need to generate your own keys and sign your boot loaders, as described in the Managing Your MOKs section.

    + + +

    Using rEFInd with Shim

    +     + +

    Because several major distributions support shim, I describe it first. You may need to adjust the rEFInd installation process to get it working with shim, especially if you're not using a distribution that uses this software. In addition to installing shim, you should know how to manage your MOKs, so I describe this topic, too. If you don't want to use shim, you can skip ahead to the section on PreBootloader.

    -

    Installation Issues

    +

    Installing Shim and rEFInd

    A working Secure Boot installation of rEFInd involves at least three programs, and probably four or more, each of which must be installed in a specific way:

    -

    Because of variables such as which version of shim you're using and whether you're installing a pre-signed version of rEFInd or want to sign it yourself, I can't provide an absolutely complete procedure for installing rEFInd to work with Secure Boot. Broadly speaking, though, the procedure should be something like this:

    +

    If you've installed Fedora 18 or OpenSUSE 12.3 and can boot it with Secure Boot active, and if you then install rEFInd using the RPM file that I provide or by running install.sh, chances are you'll end up with a working rEFInd that will start up the first time, with one caveat: You'll have to use MokManager to add rEFInd's MOK to your MOK list, as described shortly. If you don't already have a working copy of shim on your ESP, your task is more complex. Broadly speaking, the procedure should be something like this:

      @@ -237,10 +249,9 @@ described on this page currently supports only x86-64, not
    1. Download shim from Matthew J. Garrett's - download site or from your distribution. (Don't use Ubuntu 12.10's + download site or from your distribution. (Don't use Ubuntu's version, though; as noted earlier, it's inadequate for use with - rEFInd.) Fedora 18 ships with a signed shim, but I've not yet tested - it.
      2. + rEFInd.)

      Tip: If you're running Linux, you can save some effort by using the install.sh script with its --shim /path/to/shim.efi option rather than installing manually, as in steps 4–6 of this procedure. If you've installed openssl and sbsign, using --localkeys will generate local signing keys and re-sign the rEFInd binaries with your own key, too. You can then use sbsign and the keys in /etc/refind.d/keys to sign your kernels or boot loaders.

      @@ -269,9 +280,9 @@ described on this page currently supports only x86-64, not disk. The screen will clear and prompt you to select a key, as shown here: -
      MokManager's user interface is crude but effective.
      +
      MokManager's user interface is crude but effective.
    2. Each of the lines with a long awkward string represents a disk partition. Select one and you'll see a list of files. Continue @@ -293,10 +304,10 @@ described on this page currently supports only x86-64, not

      At this point the computer may boot into its default OS, reboot, or perhaps even hang. When you reboot it, though, rEFInd should start up in Secure Boot mode. (You can verify this by selecting the About rEFInd tool in the main menu. Check the Platform item in the resulting screen; it should verify that Secure Boot is active.) You should now be able to launch any boot loader signed with a key recognized by the firmware or by shim (including any MOKs you've enrolled). If you want to manage keys in the future, rEFInd displays a new icon in the second (tools) row you can use to launch MokManager. (This icon appears by default if MokManager is installed, but if you edit showtools in refind.conf, you must be sure to include mok_tool as an option in order to gain access to it.)

      -

      If you're using Ubuntu 12.10, you can't use its version of shim, but you can replace it with Garrett's shim. If you do so, though, you'll have to add Ubuntu's public key as a MOK, at least if you intend to launch Ubuntu's version of GRUB or launch Ubuntu-provided signed kernels. Ubuntu's public key is available in the shim_0~20120906.bcd0a4e8-0ubuntu4.debian.tar.gz tarball, as canonical-uefi-ca.der. (The filename extensions .cer and .der are interchangeable for most purposes.) I've also included this key with rEFInd, in the refind/keys subdirectory of its package file. To use this key, copy it to your ESP and enroll it with MokManager. See this blog post for further details on Ubuntu 12.10's handling of Secure Boot. In principle, you should be able to use shim 0.2 or later from future distributions that include it; but you must be sure that whatever you use supports MokManager.

      +

      If you're using Ubuntu, you can't use its version of shim, but you can replace it with Garrett's shim. If you do so, though, you'll have to add Ubuntu's public key as a MOK, at least if you intend to launch Ubuntu's version of GRUB or launch Ubuntu-provided signed kernels. Ubuntu's public key is available in the shim_0~20120906.bcd0a4e8-0ubuntu4.debian.tar.gz tarball, as canonical-uefi-ca.der. (The filename extensions .cer and .der are interchangeable for most purposes.) I've also included this key with rEFInd, in the refind/keys subdirectory of its package file. To use this key, copy it to your ESP and enroll it with MokManager. See this blog post for further details on Ubuntu 12.10's handling of Secure Boot. In principle, you should be able to use shim 0.2 or later from future distributions that include it; but you must be sure that whatever you use supports MokManager.

      -

      Managing Your MOKs

      +

      Managing Your MOKs

      The preceding instructions provided the basics of getting rEFInd up and running, including using MokManager to enroll a MOK on your computer. If you need to sign binaries, though, you'll have to use additional tools. The OpenSSL package provides the cryptographic tools necessary, but actually signing EFI binaries requires additional software. Two packages for this are available: sbsigntool and pesign. Both are available in binary form from this OpenSUSE Build Service (OBS) repository. The following procedure uses sbsigntool. To sign your own binaries, follow these steps (you can skip the first five steps if you've used install.sh's --localkeys option):

      @@ -370,6 +381,79 @@ $ openssl x509 -in refind_local.crt -out refind_local.cer

      At this point you should be able to launch the binaries you've signed. Unfortunately, there can still be problems at this point....

      + +

      Using rEFInd with PreBootloader

      +       + +

      If you want to use Secure Boot with a distribution that doesn't come with shim but the preceding description exhausts you, take heart: PreBootloader is easier to set up and use for your situation! Unfortunately, it's still not as easy to use as not using Secure Boot at all, and it's got some drawbacks, but it may represent an acceptable middle ground. To get started, proceed as follows:

      + +
        + +
      1. Boot the computer. As with shim, this can be a challenge; you may need + to boot with Secure Boot disabled, use a Secure Boot–enabled live + CD, or do the installation from Windows.
        2. + +
      2. Download rEFInd in binary form (the binary + zip or CD-R image file). If you download the binary zip file, unzip it; + if you get the CD-R image file, burn it to a CD-R and mount it.
        3. + +
      3. Download PreBootloader from its + release page or by clicking the following links. Be sure to get + both the PreLoader.efi + and HashTool.efi + files.
        4. + +
      4. Copy the PreLoader.efi and HashTool.efi binaries to + the directory you intend to use for rEFInd—for instance, + EFI/refind on the ESP.
        5. + +
      5. Follow the installation instructions for rEFInd on the Installing rEFInd page; however, give rEFInd + the filename loader.efi and register PreLoader.efi + with the EFI by using efibootmgr in Linux or bcdedit + in Windows. Be sure that rEFInd (as loader.efi), + PreLoader.efi, and HashTool.efi all reside in the + same directory.
        6. + +
      6. Reboot. With any luck, you'll see HashTool appear with a warning + message stating that it was unable to launch loader.efi and + declaring that it will launch HashTool.efi. Press the Enter + key to continue.
        7. + +
      7. HashTool should now appear. It should give you three or four options, + including Enroll Hash, as shown here. Select this option
        8. + +
        HashTool provide a somewhat nicer user interface than + MokManager's.
        + +
      8. You can now select the binary you want to authorize. You should first + select loader.efi, since that's rEFInd. The program presents + the hash (a very long number) and asks for confirmation. Be sure to + select Yes.
        9. + +
        Be sure to select the right binary when you enroll its hash.
        + +

        Note: Unfortunately, HashTool's file selector can't change filesystems. Thus, if you want to boot a Linux kernel using rEFInd and PreBootloader, you'll need to copy the kernel to the ESP, at least temporarily. Alternatively, as noted earlier, you can copy HashTool.efi to the directory that holds the kernels or to another directory on that partition that rEFInd scans—but be sure to rename HashTool.efi or rEFInd will ignore it. You'll then see a boot loader entry for HashTool.

        + +
      9. Repeat the preceding two steps for any additional binaries you might + want to enroll. These include any EFI filesystem drivers you're using, + any boot loaders you're launching from rEFInd (other than those that + are already signed, such as Microsoft's boot loader), and possibly your + Linux kernel.
        10. + +
      10. At the HashTool main menu, select Exit. rEFInd should + launch.
        11. + +
      + +

      If you did everything right, rEFInd should now launch follow-on boot loaders and kernels, including both programs signed with the platform's Secure Boot keys and binaries that you've authorized with HashTool. If you need to authorize additional programs, you can do so from rEFInd by using the MOK utility tool icon that launches HashTool.efi from the second row of icons. (This icon should appear by default, but if you uncomment the showtools token in refind.conf, be sure that mok_tool is present among the options.)

      +

      Secure Boot Caveats

       @@ -385,10 +469,10 @@ $ openssl x509 -in refind_local.crt -out refind_local.cer partitions.
    3. As of version 0.6.2, rEFInd's own Secure Boot support is theoretically - able to work on non-x86-64 platforms; however, shim 0.2 works - only on x86-64, and rEFInd is dependent upon shim. Thus, you'll - have to wait for future shim developments if you want to use Secure - Boot on x86 or ARM computers.
      4. + able to work on non-x86-64 platforms; however, shim 0.2 and + PreBootloader both work only on x86-64, and rEFInd is dependent + upon these tools. Thus, you'll have to wait for future developments if + you want to use Secure Boot on x86 or ARM computers.
    4. In theory, signing Microsoft's boot loader with a MOK should work. This might be handy if you want to replace your computer's built-in keys @@ -397,7 +481,7 @@ $ openssl x509 -in refind_local.crt -out refind_local.cer -

      If you launch a boot loader or other program from rEFInd that relies on the EFI's standard program-launching code, that program should take advantage of shim and its MOKs. For instance, if you launch gummiboot from rEFInd (and rEFInd from shim), gummiboot should be able to launch shim/MOK-signed Linux kernels. This is not currently true if you launch gummiboot directly from shim.

      +

      If you launch a boot loader or other program from rEFInd that relies on the EFI's standard program-launching code, that program should take advantage of shim and its MOKs. For instance, if you launch gummiboot from rEFInd (and rEFInd from shim), gummiboot should be able to launch shim/MOK-signed Linux kernels. This is not currently true if you launch gummiboot directly from shim. (You can launch gummiboot from PreBootloader and it should work, though, because of technical differences between how shim and PreBootloader work.)

      My focus in testing rEFInd's Secure Boot capabilities has been on getting Linux kernels with EFI stub loaders to launch correctly. I've done some minimal testing with GRUB 2, though. I've also tested some self-signed binaries, such as an EFI shell and MokManager. (The EFI shell launches, but will not itself launch anything that's not been signed with a UEFI Secure Boot key, even with rEFInd 0.6.2. This of course limits its utility.)

      diff --git a/docs/refind/themes.html b/docs/refind/themes.html index 4561432..6bfdd40 100644 --- a/docs/refind/themes.html +++ b/docs/refind/themes.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

      Originally written: 4/19/2012; last Web page update: -4/25/2013, referencing rEFInd 0.6.9

      +5/5/2013, referencing rEFInd 0.6.10

      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!

      diff --git a/docs/refind/todo.html b/docs/refind/todo.html index ef4520b..2879cb1 100644 --- a/docs/refind/todo.html +++ b/docs/refind/todo.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

      Originally written: 3/14/2012; last Web page update: -4/25/2013, referencing rEFInd 0.6.9

      +5/5/2013, referencing rEFInd 0.6.10

      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!

      @@ -148,12 +148,6 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

      systems with a limited number of configurations. Therefore, if you try rEFInd and run into bugs, please report them to me!
      5. -
    5. I have little talent with graphics manipulation programs, so - rEFInd's boot logo, such as it is, is pretty weak. If you have - artistic talent and would like to create a rEFInd logo, please feel - free to send it to me. I won't make any final decision about - changes until at least June 30 of 2012.
      6. -
    6. rEFIt's original design, and hence rEFInd's design, enables easy theming by replacing icon files. If you'd like to design a new theme for rEFInd, feel free to submit it. I might or might not @@ -216,10 +210,10 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

      the list, it will take precedence over the normal hard disk default.
      7. -
    7. Along the lines of the previous item, the default_selection might - be expanded to support some form of specification of disk types, as - in a special entry for any optical disk or any external disk, no - matter what its name is.
      8. +
    8. Along the lines of the previous item, the + default_selection might be expanded to support some form + of specification of disk types, as in a special entry for any + optical disk or any external disk, no matter what its name is.
    9. It would be useful to be able to specify paths to boot loaders and/or initial RAM disks relative to the rEFInd directory (or the diff --git a/docs/refind/using.html b/docs/refind/using.html index b7b6933..7c1b0a7 100644 --- a/docs/refind/using.html +++ b/docs/refind/using.html @@ -15,7 +15,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

      Originally written: 3/14/2012; last Web page update: -4/25/2013, referencing rEFInd 0.6.9

      +5/5/2013, referencing rEFInd 0.6.10

      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!

      diff --git a/filesystems/fsw_efi.c b/filesystems/fsw_efi.c index 9aadb45..55709d4 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.9 " FSW_EFI_STRINGIFY(t) L" File System Driver" +#define FSW_EFI_DRIVER_NAME(t) L"rEFInd 0.6.10 " FSW_EFI_STRINGIFY(t) L" File System Driver" // function prototypes diff --git a/keys/README.txt b/keys/README.txt index 1240e34..0fb79b6 100644 --- a/keys/README.txt +++ b/keys/README.txt @@ -21,11 +21,17 @@ The files in this directory are, in alphabetical order: - altlinux.cer -- The public key for ALT Linux (http://www.altlinux.com). -- canonical-uefi-ca.der -- Canonical's public key, used to sign Ubuntu - boot loaders and kernels. +- canonical-uefi-ca.crt & canonical-uefi-ca.der -- Canonical's public key, + used to sign Ubuntu boot loaders and kernels. -- fedora-ca.cer -- Fedora's public key, used to sign Fedora 18's version of - shim and Fedora 18's kernels. +- fedora-ca.cer & fedora-ca.crt -- Fedora's public key, used to sign Fedora + 18's version of shim and Fedora 18's kernels. + +- openSUSE-UEFI-CA-Certificate.cer & openSUSE-UEFI-CA-Certificate.crt -- + Public keys used to sign OpenSUSE 12.3. - refind.cer & refind.crt -- My own (Roderick W. Smith's) public key, used to sign refind_x64.efi and the 64-bit rEFInd drivers. + +- SLES-UEFI-CA-Certificate.cer & SLES-UEFI-CA-Certificate.crt -- The + Public key for SUSE Linux Enterprise Server. diff --git a/refind.conf-sample b/refind.conf-sample index 8a8b3f9..3f3ae26 100644 --- a/refind.conf-sample +++ b/refind.conf-sample @@ -8,6 +8,12 @@ # timeout 20 +# Screen saver timeout; the screen blanks after the specified number of +# seconds with no keyboard input. The screen returns after most keypresses +# (unfortunately, not including modifier keys such as Shift, Control, Alt, +# or Option). The default is 0, which disables the screen saver. +#screensaver 300 + # Hide user interface elements for personal preference or to increase # security: # banner - the rEFInd title banner (built-in or loaded via "banner") diff --git a/refind.spec b/refind.spec index 4fc1869..2e4d392 100644 --- a/refind.spec +++ b/refind.spec @@ -1,6 +1,6 @@ Summary: EFI boot manager software Name: refind -Version: 0.6.9.2 +Version: 0.6.10 Release: 1%{?dist} Summary: EFI boot manager software License: GPLv3 diff --git a/refind/main.c b/refind/main.c index 3c4f958..60de8df 100644 --- a/refind/main.c +++ b/refind/main.c @@ -144,7 +144,7 @@ static VOID AboutrEFInd(VOID) if (AboutMenu.EntryCount == 0) { AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT); - AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.6.9.2"); + AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.6.10"); AddMenuInfoLine(&AboutMenu, L""); AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer"); AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2013 Roderick W. Smith"); diff --git a/refind/menu.c b/refind/menu.c index 8cf1cc8..40f26a1 100644 --- a/refind/menu.c +++ b/refind/menu.c @@ -350,6 +350,21 @@ static VOID IdentifyRows(IN SCROLL_STATE *State, IN REFIT_MENU_SCREEN *Screen) { State->MaxVisible = State->FinalRow0 + 1; } // static VOID IdentifyRows() +// Blank the screen, wait for a keypress, and restore banner/background. +// Screen may still require redrawing of text and icons on return. +// TODO: Support more sophisticated screen savers, such as power-saving +// mode and dynamic images. +static VOID SaveScreen(VOID) { + UINTN index; + EG_PIXEL Black = { 0x0, 0x0, 0x0, 0 }; + + egClearScreen(&Black); + refit_call3_wrapper(BS->WaitForEvent, 1, &ST->ConIn->WaitForKey, &index); + if (AllowGraphicsMode) + SwitchToGraphicsAndClear(); + ReadAllKeyStrokes(); +} // VOID SaveScreen() + // // generic menu function // @@ -363,10 +378,11 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty INTN ShortcutEntry; BOOLEAN HaveTimeout = FALSE; UINTN TimeoutCountdown = 0; - INTN PreviousTime = -1, CurrentTime; + INTN PreviousTime = -1, CurrentTime, TimeSinceKeystroke = 0; CHAR16 TimeoutMessage[256]; CHAR16 KeyAsString[2]; UINTN MenuExit; +// EG_PIXEL Black = { 0x0, 0x0, 0x0, 0 }; if (Screen->TimeoutSeconds > 0) { HaveTimeout = TRUE; @@ -412,11 +428,23 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty } else if (HaveTimeout) { refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms TimeoutCountdown--; + TimeSinceKeystroke++; + } else if (GlobalConfig.ScreensaverTime > 0) { + refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms + TimeSinceKeystroke++; + if (TimeSinceKeystroke > (GlobalConfig.ScreensaverTime * 10)) { + SaveScreen(); + State.PaintAll = TRUE; + TimeSinceKeystroke = 0; + } // if } else { refit_call3_wrapper(BS->WaitForEvent, 1, &ST->ConIn->WaitForKey, &index); } continue; - } + } else { + TimeSinceKeystroke = 0; + } // if/else !read keystroke + if (HaveTimeout) { // the user pressed a key, cancel the timeout StyleFunc(Screen, &State, MENU_FUNCTION_PAINT_TIMEOUT, L""); @@ -497,6 +525,21 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty // text-mode generic style // +// Show information lines in text mode. +static VOID ShowTextInfoLines(IN REFIT_MENU_SCREEN *Screen) { + INTN i; + + BeginTextScreen(Screen->Title); + if (Screen->InfoLineCount > 0) { + refit_call2_wrapper(ST->ConOut->SetAttribute, ST->ConOut, ATTR_BASIC); + for (i = 0; i < (INTN)Screen->InfoLineCount; i++) { + refit_call3_wrapper(ST->ConOut->SetCursorPosition, ST->ConOut, 3, 4 + i); + refit_call2_wrapper(ST->ConOut->OutputString, ST->ConOut, Screen->InfoLines[i]); + } + } +} // VOID ShowTextInfoLines() + +// Do most of the work for text-based menus.... static VOID TextMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, IN UINTN Function, IN CHAR16 *ParamText) { INTN i; @@ -549,16 +592,6 @@ static VOID TextMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, // TODO: account for double-width characters } // for - // initial painting - BeginTextScreen(Screen->Title); - if (Screen->InfoLineCount > 0) { - refit_call2_wrapper(ST->ConOut->SetAttribute, ST->ConOut, ATTR_BASIC); - for (i = 0; i < (INTN)Screen->InfoLineCount; i++) { - refit_call3_wrapper(ST->ConOut->SetCursorPosition, ST->ConOut, 3, 4 + i); - refit_call2_wrapper(ST->ConOut->OutputString, ST->ConOut, Screen->InfoLines[i]); - } - } - break; case MENU_FUNCTION_CLEANUP: @@ -570,6 +603,8 @@ static VOID TextMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, case MENU_FUNCTION_PAINT_ALL: // paint the whole screen (initially and after scrolling) + + ShowTextInfoLines(Screen); for (i = 0; i <= State->MaxIndex; i++) { if (i >= State->FirstVisible && i <= State->LastVisible) { refit_call3_wrapper(ST->ConOut->SetCursorPosition, ST->ConOut, 2, MenuPosY + (i - State->FirstVisible)); @@ -816,22 +851,6 @@ static VOID GraphicsMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *Sta Screen->Title[i] = 0; } // if } // if/else - - DrawText(Screen->Title, FALSE, (StrLen(Screen->Title) + 2) * CharWidth, TitlePosX, EntriesPosY += TextLineHeight()); - if (Screen->TitleImage) { - BltImageAlpha(Screen->TitleImage, EntriesPosX + TITLEICON_SPACING, EntriesPosY + TextLineHeight() * 2, - BackgroundPixel); - EntriesPosX += (Screen->TitleImage->Width + TITLEICON_SPACING * 2); - } - EntriesPosY += (TextLineHeight() * 2); - if (Screen->InfoLineCount > 0) { - for (i = 0; i < (INTN)Screen->InfoLineCount; i++) { - DrawText(Screen->InfoLines[i], FALSE, LineWidth, EntriesPosX, EntriesPosY); - EntriesPosY += TextLineHeight(); - } - EntriesPosY += TextLineHeight(); // also add a blank line - } - break; case MENU_FUNCTION_CLEANUP: @@ -839,19 +858,35 @@ static VOID GraphicsMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *Sta break; case MENU_FUNCTION_PAINT_ALL: - for (i = 0; i <= State->MaxIndex; i++) { - DrawText(Screen->Entries[i]->Title, (i == State->CurrentSelection), LineWidth, EntriesPosX, - EntriesPosY + i * TextLineHeight()); - } - if (!(GlobalConfig.HideUIFlags & HIDEUI_FLAG_HINTS)) { - if ((Screen->Hint1 != NULL) && (StrLen(Screen->Hint1) > 0)) - DrawTextWithTransparency(Screen->Hint1, (UGAWidth - egComputeTextWidth(Screen->Hint1)) / 2, - UGAHeight - (egGetFontHeight() * 3)); - if ((Screen->Hint2 != NULL) && (StrLen(Screen->Hint2) > 0)) - DrawTextWithTransparency(Screen->Hint2, (UGAWidth - egComputeTextWidth(Screen->Hint2)) / 2, + ComputeSubScreenWindowSize(Screen, State, &EntriesPosX, &EntriesPosY, &MenuWidth, &MenuHeight, &LineWidth); + DrawText(Screen->Title, FALSE, (StrLen(Screen->Title) + 2) * CharWidth, TitlePosX, EntriesPosY += TextLineHeight()); + if (Screen->TitleImage) { + BltImageAlpha(Screen->TitleImage, EntriesPosX + TITLEICON_SPACING, EntriesPosY + TextLineHeight() * 2, + BackgroundPixel); + EntriesPosX += (Screen->TitleImage->Width + TITLEICON_SPACING * 2); + } + EntriesPosY += (TextLineHeight() * 2); + if (Screen->InfoLineCount > 0) { + for (i = 0; i < (INTN)Screen->InfoLineCount; i++) { + DrawText(Screen->InfoLines[i], FALSE, LineWidth, EntriesPosX, EntriesPosY); + EntriesPosY += TextLineHeight(); + } + EntriesPosY += TextLineHeight(); // also add a blank line + } + + for (i = 0; i <= State->MaxIndex; i++) { + DrawText(Screen->Entries[i]->Title, (i == State->CurrentSelection), LineWidth, EntriesPosX, + EntriesPosY + i * TextLineHeight()); + } + if (!(GlobalConfig.HideUIFlags & HIDEUI_FLAG_HINTS)) { + if ((Screen->Hint1 != NULL) && (StrLen(Screen->Hint1) > 0)) + DrawTextWithTransparency(Screen->Hint1, (UGAWidth - egComputeTextWidth(Screen->Hint1)) / 2, + UGAHeight - (egGetFontHeight() * 3)); + if ((Screen->Hint2 != NULL) && (StrLen(Screen->Hint2) > 0)) + DrawTextWithTransparency(Screen->Hint2, (UGAWidth - egComputeTextWidth(Screen->Hint2)) / 2, UGAHeight - (egGetFontHeight() * 2)); - } // if - break; + } // if + break; case MENU_FUNCTION_PAINT_SELECTION: // redraw selection cursor diff --git a/refind/screen.c b/refind/screen.c index fd29f5c..335dc93 100644 --- a/refind/screen.c +++ b/refind/screen.c @@ -291,7 +291,7 @@ static VOID DrawScreenHeader(IN CHAR16 *Title) // Keyboard input // -static BOOLEAN ReadAllKeyStrokes(VOID) +BOOLEAN ReadAllKeyStrokes(VOID) { BOOLEAN GotKeyStrokes; EFI_STATUS Status; diff --git a/refind/screen.h b/refind/screen.h index f17e549..25bdbb9 100644 --- a/refind/screen.h +++ b/refind/screen.h @@ -90,6 +90,7 @@ VOID DebugPause(VOID); #define DebugPause() #endif VOID EndlessIdleLoop(VOID); +BOOLEAN ReadAllKeyStrokes(VOID); VOID PauseForKey(VOID); BOOLEAN CheckFatalError(IN EFI_STATUS Status, IN CHAR16 *where);