Changes to enable rEFInd to build with GCC 5.1. Also some more

[refind] / refind.conf-sample

diff --git a/refind.conf-sample b/refind.conf-sample
index 193a75d05360afaa5597182861254914a8afe68b..615a357ca81eac85dee5fc394ada002ca8c7ee78 100644 (file)
--- a/refind.conf-sample
+++ b/refind.conf-sample
@@ -30,6 +30,7 @@ timeout 20
 #  arrows      - scroll arrows on the OS selection tag line
 #  hints       - brief command summary in the menu
 #  editor      - the options editor (+, F2, or Insert on boot options menu)
+#  badges      - device-type badges for boot options
 #  all         - all of the above
 # Default is none of these (all elements active)
 #
@@ -221,7 +222,7 @@ timeout 20
 # 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 "uefi_deep_legacy_scan true")
+# Default is unset (or "uefi_deep_legacy_scan false")
 #
 #uefi_deep_legacy_scan
 
@@ -308,6 +309,15 @@ timeout 20
 #
 #scan_all_linux_kernels false
 
+# Combine all Linux kernels in a given directory into a single entry.
+# When so set, the kernel with the most recent time stamp will be launched
+# by default, and its filename will appear in the entry's description.
+# To launch other kernels, the user must press F2 or Insert; alternate
+# kernels then appear as options on the sub-menu.
+# Default is "true" -- kernels are "folded" into a single menu entry.
+#
+#fold_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
 # a subset in a scrolling list. If this value is set too high for the
@@ -372,9 +382,9 @@ timeout 20
 # keywords within each stanza include:
 #
 #  volume    - identifies the filesystem from which subsequent files
-#              are loaded. You can specify the volume by label or by
-#              a number followed by a colon (as in "0:" for the first
-#              filesystem or "1:" for the second).
+#              are loaded. You can specify the volume by filesystem
+#              label, by partition label, or by partition GUID number
+#              (but NOT yet by filesystem UUID number).
 #  loader    - identifies the boot loader file
 #  initrd    - Specifies an initial RAM disk file
 #  icon      - specifies a custom boot loader icon
@@ -406,15 +416,14 @@ timeout 20
 # Find one similar to what you need, copy it, remove the "disabled" line,
 # and adjust the entries to suit your needs.
 
-# A sample entry for a Linux 3.3 kernel with its new EFI boot stub
-# support on a filesystem called "KERNELS". This entry includes
-# Linux-specific boot options and specification of an initial RAM disk.
-# Note uses of Linux-style forward slashes, even in the initrd
-# specification. Also note that a leading slash is optional in file
-# specifications.
+# A sample entry for a Linux 3.13 kernel with EFI boot stub support
+# on a partition with a GUID of 904404F8-B481-440C-A1E3-11A5A954E601.
+# This entry includes Linux-specific boot options and specification
+# of an initial RAM disk. Note uses of Linux-style forward slashes.
+# Also note that a leading slash is optional in file specifications.
 menuentry Linux {
        icon EFI/refind/icons/os_linux.png
-       volume KERNELS
+       volume 904404F8-B481-440C-A1E3-11A5A954E601
        loader bzImage-3.3.0-rc7
        initrd initrd-3.3.0.img
        options "ro root=UUID=5f96cafa-e0a7-4057-b18f-fa709db5b837"