From: srs5694 <srs5694@users.sourceforge.net>
Date: Wed, 18 Dec 2013 23:56:23 +0000 (-0500)
Subject: Fixed bug in install.sh and mkrlconf.sh that caused mangling of
X-Git-Url: https://code.delx.au/refind/commitdiff_plain/3dd83b854add24b49f7ae8db532e9c4934f2a7f9

Fixed bug in install.sh and mkrlconf.sh that caused mangling of
generated refind_linux.conf file on some systems.
---

diff --git a/NEWS.txt b/NEWS.txt
index 0850bc9..ba6e17d 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,10 @@
+0.7.7 (??/??/201?):
+-------------------
+
+- Fixed bug in mkrlconf.sh and install.sh that caused a stray line break
+  and PARTUUID= specification to appear in generated refind_linux.conf file
+  under some circumstances.
+
 0.7.6 (12/15/2013):
 -------------------
 
diff --git a/docs/refind/getting.html b/docs/refind/getting.html
index 9029bb8..a72f7e4 100644
--- a/docs/refind/getting.html
+++ b/docs/refind/getting.html
@@ -15,7 +15,7 @@
 href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com</a></p>
 
 <p>Originally written: 3/14/2012; last Web page update:
-12/15/2013, referencing rEFInd 0.7.6</p>
+12/17/2013, referencing rEFInd 0.7.6</p>
 
 <p>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!</p>
 
@@ -187,7 +187,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com</a></p>
     either build.)</li>
 -->
 
-<p class="sidebar"><b>Note:</b> At the moment, neither the bootable CD-R image file nor the bootable USB flash drive image file supports booting with Secure Boot active.</p>
+<p class="sidebar"><b>Note:</b> At the moment, neither the bootable CD-R image file nor the bootable USB flash drive image file supports booting with Secure Boot active. The x86-64 version of the <a href="http://en.altlinux.org/Rescue">ALT Linux Rescue disc</a> uses a Secure Boot-enabled rEFInd, though, so you may find that useful in some situations.</p>
 
 <li><b><a
     href="http://sourceforge.net/projects/refind/files/0.7.6/refind-cd-0.7.6.zip/download">A
diff --git a/install.sh b/install.sh
index 99102e4..befdcce 100755
--- a/install.sh
+++ b/install.sh
@@ -35,6 +35,7 @@
 #
 # Revision history:
 #
+# 0.7.7   -- Fixed bug that created mangled refind_linux.conf file
 # 0.7.6   -- Added --ownhfs {device-filename} option
 # 0.7.5   -- Fixed bug when installing to ESP on recent versions of OS X
 # 0.7.2   -- Fixed code that could be confused by use of autofs to mount the ESP
@@ -774,7 +775,7 @@ GenerateRefindLinuxConf() {
       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 -s UUID "$RootFS" 2> /dev/null | grep UUID=`
          if [[ -n $Uuid ]] ; then
             RootFS="$Uuid"
          fi
diff --git a/mkrlconf.sh b/mkrlconf.sh
index e7ffc6b..0a5d307 100755
--- a/mkrlconf.sh
+++ b/mkrlconf.sh
@@ -18,6 +18,7 @@
 
 # Revision history:
 #
+#  0.7.7 -- Fixed bug that caused stray PARTUUID= and line breaks in generated file
 #  0.5.1 -- Initial release
 #
 # Note: mkrlconf.sh version numbers match those of the rEFInd package
@@ -34,7 +35,7 @@ if [[ ! -f $RLConfFile || $1 == "--force" ]] ; then
    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 -s UUID $RootFS 2> /dev/null | grep UUID=`
       if [[ -n $Uuid ]] ; then
          RootFS=$Uuid
       fi
diff --git a/refind.conf-sample b/refind.conf-sample
index 30dd55e..c8f2a5d 100644
--- a/refind.conf-sample
+++ b/refind.conf-sample
@@ -11,7 +11,8 @@ 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.
+# or Option). Setting a value of "-1" causes rEFInd to start up with its
+# screen saver active. The default is 0, which disables the screen saver.
 #screensaver 300
 
 # Hide user interface elements for personal preference or to increase