X-Git-Url: https://code.delx.au/refind/blobdiff_plain/9a669ad3b5fb341500d76d487c38a7102eb01b3d..463d49c9646ad30a500cc9a6305676b790871945:/refind.conf-sample

diff --git a/refind.conf-sample b/refind.conf-sample
index e06c5c3..19d0430 100644
--- a/refind.conf-sample
+++ b/refind.conf-sample
@@ -209,12 +209,13 @@ timeout 20
 
 # By default, rEFInd relies on the UEFI firmware to detect BIOS-mode boot
 # devices. This sometimes doesn't detect all the available devices, though.
-# For these cases, deep_uefi_legacy_scan results in a forced scan and
+# For these cases, uefi_deep_legacy_scan results in a forced scan and
 # modification of NVRAM variables on each boot. Adding "0", "off", or
 # "false" resets to the default value. This token has no effect on Macs or
 # when no BIOS-mode options are set via scanfor.
-# Default is unset (or "deep_uefi_legacy_scan true")
-#deep_uefi_legacy_scan
+# Default is unset (or "uefi_deep_legacy_scan true")
+#
+#uefi_deep_legacy_scan
 
 # Delay for the specified number of seconds before scanning disks.
 # This can help some users who find that some of their disks
@@ -291,16 +292,14 @@ timeout 20
 # useful for better integration with Linux distributions that provide
 # kernels with EFI stub loaders but that don't give those kernels filenames
 # that end in ".efi", particularly if the kernels are stored on a
-# filesystem that the EFI can read. When uncommented, this option causes
-# all files in scanned directories with names that begin with "vmlinuz"
-# or "bzImage" to be included as loaders, even if they lack ".efi"
-# extensions. The drawback to this option is that it can pick up kernels
-# that lack EFI stub loader support and other files. Passing this option
-# a "0" value causes kernels without ".efi" extensions to NOT be scanned;
-# passing it alone or with any other value causes all kernels to be scanned.
-# Default is to NOT scan for kernels without ".efi" extensions.
+# filesystem that the EFI can read. When set to "1", "true", or "on", this
+# option causes all files in scanned directories with names that begin with
+# "vmlinuz" or "bzImage" to be included as loaders, even if they lack ".efi"
+# extensions. Passing this option a "0", "false", or "off" value causes
+# kernels without ".efi" extensions to NOT be scanned.
+# Default is "true" -- to scan for kernels without ".efi" extensions.
 #
-scan_all_linux_kernels
+#scan_all_linux_kernels false
 
 # Set the maximum number of tags that can be displayed on the screen at
 # any time. If more loaders are discovered than this value, rEFInd shows
@@ -316,10 +315,13 @@ scan_all_linux_kernels
 # default loader using:
 #  - A digit between 1 and 9, in which case the Nth loader in the menu
 #    will be the default. 
+#  - A "+" symbol at the start of the string, which refers to the most
+#    recently booted loader.
 #  - Any substring that corresponds to a portion of the loader's title
 #    (usually the OS's name or boot loader's path).
 # You may also specify multiple selectors by separating them with commas
-# and enclosing the list in quotes.
+# and enclosing the list in quotes. (The "+" option is only meaningful in
+# this context.)
 # If you follow the selector(s) with two times, in 24-hour format, the
 # default will apply only between those times. The times are in the
 # motherboard's time standard, whether that's UTC or local time, so if
@@ -329,10 +331,11 @@ scan_all_linux_kernels
 # case the last one to match takes precedence. Thus, you can set a main
 # option without a time followed by one or more that include times to
 # set different defaults for different times of day.
+# The default behavior is to boot the previously-booted OS.
 #
 #default_selection 1
 #default_selection Microsoft
-#default_selection "bzImage,vmlinuz"
+#default_selection "+,bzImage,vmlinuz"
 #default_selection Maintenance 23:30 2:00
 #default_selection "Maintenance,OS X" 1:00 2:30
 
@@ -392,7 +395,7 @@ scan_all_linux_kernels
 # specification. Also note that a leading slash is optional in file
 # specifications.
 menuentry Linux {
-	icon EFI/refind/icons/os_linux.icns
+	icon EFI/refind/icons/os_linux.png
 	volume KERNELS
 	loader bzImage-3.3.0-rc7
 	initrd initrd-3.3.0.img
@@ -404,7 +407,7 @@ menuentry Linux {
 # its GRUB 2 boot loader. Note uses of Linux-style forward slashes
 menuentry Ubuntu {
 	loader /EFI/ubuntu/grubx64.efi
-	icon /EFI/refined/icons/os_linux.icns
+	icon /EFI/refined/icons/os_linux.png
 	disabled
 }
 
@@ -429,7 +432,7 @@ menuentry "Windows 7" {
 # could initialize hardware and then launch an OS, or it could
 # do something entirely different.
 menuentry "Windows via shell script" {
-	icon \EFI\refind\icons\os_win.icns
+	icon \EFI\refind\icons\os_win.png
 	loader \EFI\tools\shell.efi
 	options "fs0:\EFI\tools\launch_windows.nsh"
 	disabled
@@ -442,7 +445,7 @@ menuentry "Windows via shell script" {
 # certainly need to change the "volume" line for this example
 # to work.
 menuentry "My Mac OS X" {
-	icon \EFI\refind\icons\os_mac.icns
+	icon \EFI\refind\icons\os_mac.png
 	volume "OS X boot"
 	loader \System\Library\CoreServices\boot.efi
 	disabled