From 50c23c4cda71f16fe17c03557a0e521f4c72e230 Mon Sep 17 00:00:00 2001
From: Arun S A G <sagarun@gmail.com>
Date: Tue, 7 Jul 2015 12:49:48 -0700
Subject: [PATCH] Fix iso-image-create to work on RedHat distros

- RedHat distros keep isolinux.bin at /usr/share/syslinux
- Do not use /usr/lib/syslinux blindly
Closes-Bug: #1472379

Change-Id: I2d58913090f2d35cc6446cf769b1f6618f29f849
---
 imagebuild/coreos/iso-image-create | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/imagebuild/coreos/iso-image-create b/imagebuild/coreos/iso-image-create
index da178684e..0baa6c354 100755
--- a/imagebuild/coreos/iso-image-create
+++ b/imagebuild/coreos/iso-image-create
@@ -97,7 +97,19 @@ mkdir -p "$TMP_IMAGE_DIR"
 # Copy isolinux bin to the isolinux directory
 mkdir -p "$TMP_IMAGE_DIR/isolinux"
 v_print "Copying isolinux.bin"
-cp /usr/lib/syslinux/isolinux.bin "$TMP_IMAGE_DIR/isolinux"
+if [ -f /usr/share/syslinux/isolinux.bin ]
+then
+    cp /usr/share/syslinux/isolinux.bin "$TMP_IMAGE_DIR/isolinux"
+
+elif [ -f /usr/lib/syslinux/isolinux.bin ]
+then
+    cp /usr/lib/syslinux/isolinux.bin "$TMP_IMAGE_DIR/isolinux"
+else
+    err_print "Could not find isolinux.bin. Install syslinux?"
+    cleanup
+    exit 1
+fi
+
 
 # Copy initrd, kernel
 v_print "Copying kernel to $TMP_IMAGE_DIR/vmlinuz"