<font style="font-family: courier new,monospace;" color="#000099"><font size="2"><br></font></font><br style="font-family: courier new,monospace;"><div style="font-family: courier new,monospace;" class="gmail_quote">On Mon, Mar 21, 2011 at 5:54 PM, Brian C. Lane <span dir="ltr"><<a href="mailto:bcl@fedoraproject.org">bcl@fedoraproject.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"> tools/livecd-iso-to-disk.sh | 14 +-<br>
tools/liveimage-mount | 256 ++++++++++++++++++++++++++++++++++++++------<br>
2 files changed, 233 insertions(+), 37 deletions(-)<br>
{...}<br></blockquote><div> </div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
commit ab97a013c88441a7d6f1e0ac85342f9025e9f6ae<br>
Author: Frederick Grose <<a href="mailto:fgrose@gmail.com">fgrose@gmail.com</a>><br>
Date: Mon Mar 21 14:09:49 2011 -0700<br>
<br>
Fix pipefailure in checkSyslinuxVersion (#689329)<br>
<br>
Use a list operation to bypass the erroneous return value.<br>
Alter the test to something that could be used to check the<br>
syslinux version, if desired.<br>
<br>
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh<br>
index deb5473..70e80ba 100755<br>
--- a/tools/livecd-iso-to-disk.sh<br>
+++ b/tools/livecd-iso-to-disk.sh<br>
@@ -559,7 +559,8 @@ checkSyslinuxVersion() {<br>
echo "You need to have syslinux installed to run this script"<br>
exit 1<br>
fi<br>
- if ! syslinux 2>&1 | grep -qe -d; then<br>
+ check=($(syslinux --version 2>&1)) || :<br>
+ if [[ 'syslinux' == $check ]]; then<br>
SYSLINUXPATH=""<br>
elif [ -n "$multi" ]; then<br>
SYSLINUXPATH="$LIVEOS/syslinux"<br>
@@ -1006,7 +1007,6 @@ fi<br>
[ -n "$efi" -a ! -d $TGTMNT$EFI_BOOT ] && mkdir -p $TGTMNT$EFI_BOOT<br>
<br>
# Live image copy<br>
-set -o pipefail<br>
if [ "$srctype" = "live" -a -z "$skipcopy" ]; then<br>
echo "Copying live image to target device."<br>
[ ! -d $TGTMNT/$LIVEOS ] && mkdir $TGTMNT/$LIVEOS<br></blockquote><div><br>Sorry,<br><br>The followup patch,<br><a href="https://bugzilla.redhat.com/attachment.cgi?id=486551">https://bugzilla.redhat.com/attachment.cgi?id=486551</a><br>
is needed.<br><br>commit 38c1015f1f920fd45561f6fc6b47c032f4be5afb<br>Author: Frederick Grose <<a href="mailto:fgrose@gmail.com">fgrose@gmail.com</a>><br>Date: Mon Mar 21 03:07:48 2011 -0400<br><br> Fix pipefailure in checkSyslinuxVersion()<br>
<br> Use a list operation to bypass the erroneous return value.<br> Alter the test to something that could be used to check the<br> syslinux version, if desired.<br><br>diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh<br>
index deb5473..3f4ae0d 100755<br>--- a/tools/livecd-iso-to-disk.sh<br>+++ b/tools/livecd-iso-to-disk.sh<br>@@ -559,7 +559,8 @@ checkSyslinuxVersion() {<br> echo "You need to have syslinux installed to run this script"<br>
exit 1<br> fi<br>- if ! syslinux 2>&1 | grep -qe -d; then<br>+ check=($(syslinux --version 2>&1)) || :<br>+ if [[ 'syslinux' != $check ]]; then<br> SYSLINUXPATH=""<br>
elif [ -n "$multi" ]; then<br> SYSLINUXPATH="$LIVEOS/syslinux"<br>@@ -1006,7 +1007,6 @@ fi<br> [ -n "$efi" -a ! -d $TGTMNT$EFI_BOOT ] && mkdir -p $TGTMNT$EFI_BOOT<br> <br>
# Live image copy<br>-set -o pipefail<br> if [ "$srctype" = "live" -a -z "$skipcopy" ]; then<br> echo "Copying live image to target device."<br> [ ! -d $TGTMNT/$LIVEOS ] && mkdir $TGTMNT/$LIVEOS<br>
</div></div>