From 32af1a6f9af65e08b7e7bb60a5a8177eb254c8f0 Mon Sep 17 00:00:00 2001 From: srs5694 Date: Sat, 14 Apr 2012 20:41:27 -0400 Subject: [PATCH 1/1] Version 0.2.6; adds more options for "volume" token in config file --- NEWS.txt | 8 ++++++-- docs/refind/bootmode.html | 2 +- docs/refind/configfile.html | 10 +++++----- docs/refind/features.html | 2 +- docs/refind/getting.html | 8 ++++---- docs/refind/index.html | 2 +- docs/refind/installing.html | 10 +++++----- docs/refind/linux.html | 2 +- docs/refind/revisions.html | 4 +++- docs/refind/todo.html | 2 +- docs/refind/using.html | 4 ++-- refind.conf-sample | 18 ++++++++++++------ refind/config.c | 34 +++++++++++++++++++++++++--------- refind/global.h | 1 + refind/lib.c | 3 +++ refind/main.c | 5 ++--- 16 files changed, 73 insertions(+), 42 deletions(-) diff --git a/NEWS.txt b/NEWS.txt index 259b03e..8723aa5 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,10 +1,14 @@ -0.2.6 (?/??/2012): +0.2.6 (4/14/2012): ------------------ - Added "volume" keyword to configuration file's stanza options. This option changes the volume from which subsequent files (specified by "loader" and "icon") are loaded. You pass "volume" the name/label of the - FILESYSTEM you want to use (not the GPT partition name). + FILESYSTEM you want to use (not the GPT partition name), or a number + followed by a colon (e.g., "1:"). The former should reliably identify a + filesystem, assuming the name is unique. The latter assigns numbers based + on the order in which they're scanned, which may not be as reliable but + should work when a volume is unnamed. - Fixed bug in 0.2.5 that caused failure of Linux initial RAM disk mapping on some (but not all) systems. Affected computers include at diff --git a/docs/refind/bootmode.html b/docs/refind/bootmode.html index d4f48d9..4d3e5ab 100644 --- a/docs/refind/bootmode.html +++ b/docs/refind/bootmode.html @@ -14,7 +14,7 @@

by Roderick W. Smith, rodsmith@rodsbooks.com

-

Originally written: 3/14/2012; last Web page update: 4/9/2012, referencing rEFInd 0.2.5

+

Originally written: 3/14/2012; last Web page update: 4/14/2012, referencing rEFInd 0.2.6

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 25330bb..ce7cebe 100644 --- a/docs/refind/configfile.html +++ b/docs/refind/configfile.html @@ -228,17 +228,17 @@ default_selection elilo volume filesystem label - Sets the volume that's used for subsequent file accesses (by icon and loader, and by implication by initrd if loader follows volume). You pass this token a filesystem's name/label, which is typically displayed under the volume's icon in file managers and that rEFInd displays on its menu at the end of the boot prompt string. If this label isn't unique, the first volume with the specified label is used. The matching is nominally case-insensitive, but on some EFIs it's case-sensitive. + Sets the volume that's used for subsequent file accesses (by icon and loader, and by implication by initrd if loader follows volume). You pass this token a filesystem's label or a volume number. A filesystem label is typically displayed under the volume's icon in file managers and that rEFInd displays on its menu at the end of the boot prompt string. If this label isn't unique, the first volume with the specified label is used. The matching is nominally case-insensitive, but on some EFIs it's case-sensitive. If a filesystem has no label, you can use a volume number followed by a colon, such as 0: to refer to the first filesystem or 1: to refer to the second. The assignment of numbers is arbitrary and may not be consistent across boots, though. It might change if you insert an optical disc or plug in a USB flash drive, for instance. If this option is not set, the volume defaults to the one from which rEFInd launched. loader filename - Sets the filename for the boot loader. You may use either Unix-style slashes (/) or Windows/EFI-style backslashes (\) to separate directory elements. In either case, the references are to files on the ESP from which rEFInd launched; you can't (yet) launch loaders from other locations. This option should normally be the first in the body of an OS stanza; if it's not, some other options may be ignored. + Sets the filename for the boot loader. You may use either Unix-style slashes (/) or Windows/EFI-style backslashes (\) to separate directory elements. In either case, the references are to files on the ESP from which rEFInd launched or to the one identified by a preceding volume token. This option should normally be the first in the body of an OS stanza; if it's not, some other options may be ignored. An exception is if you want to boot a loader from a volume other than the one on which rEFInd resides, in which case volume should precede loader. initrd filename - Sets the filename for a Linux kernel's initial RAM disk (initrd). This option is useful only when booting a Linux kernel that includes an EFI stub loader, which enables you to boot a kernel without the benefit of a separate boot loader. When booted in this way, though, you must normally pass an initrd filename to the boot loader. You must specify the complete EFI path to the initrd file with this option, as in initrd EFI/linux/initrd-3.3.0-rc7.img. You'll also have to use the options line to pass the Linux root filesystem, and perhaps other options (as in options "root=/dev/sda4 ro"). + Sets the filename for a Linux kernel's initial RAM disk (initrd). This option is useful only when booting a Linux kernel that includes an EFI stub loader, which enables you to boot a kernel without the benefit of a separate boot loader. When booted in this way, though, you must normally pass an initrd filename to the boot loader. You must specify the complete EFI path to the initrd file with this option, as in initrd EFI/linux/initrd-3.3.0-rc7.img. You'll also have to use the options line to pass the Linux root filesystem, and perhaps other options (as in options "root=/dev/sda4 ro"). The initial RAM disk file must reside on the same volume as the kernel. icon @@ -317,7 +317,7 @@ menuentry Gentoo { loader filename - Sets the filename for the boot loader, as described in Table 2. + Sets the filename for the boot loader, as described in Table 2. Note that the loader is read from whatever filesystem is specified by the main stanza's volume option, provided that option precedes the submenu definition. initrd @@ -346,7 +346,7 @@ menuentry Gentoo { -

The following menu entry illustrates the use of submenu entries. This is an expansion on the second entry presented earlier:

+

The following menu entry illustrates the use of submenu entries. This is a variant of the second entry presented earlier:

 menuentry Gentoo {
diff --git a/docs/refind/features.html b/docs/refind/features.html
index 13508ae..0789f19 100644
--- a/docs/refind/features.html
+++ b/docs/refind/features.html
@@ -14,7 +14,7 @@
 
by Roderick W. Smith, rodsmith@rodsbooks.com

 
-
Originally written: 3/14/2012; last Web page update: 4/9/2012, referencing rEFInd 0.2.5

+
Originally written: 3/14/2012; last Web page update: 4/14/2012, referencing rEFInd 0.2.6

 
 
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/getting.html b/docs/refind/getting.html
index a5e6905..d2070f0 100644
--- a/docs/refind/getting.html
+++ b/docs/refind/getting.html
@@ -14,7 +14,7 @@
   
by Roderick W. Smith, rodsmith@rodsbooks.com

 
-  
Originally written: 3/14/2012; last Web page update: 4/9/2012, referencing rEFInd 0.2.5

+  
Originally written: 3/14/2012; last Web page update: 4/14/2012, referencing rEFInd 0.2.6

 
 
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!

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