From 89c5e1a8cde89e1771ba0c8e47a3d1ed0f1e9416 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Tue, 13 Aug 2013 14:58:47 +0200
Subject: [PATCH] usbinstall: don't fail if a syslinux module is missing, to
 allow using both versions 4 and 5

---
 src/usbinstall.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/usbinstall.sh b/src/usbinstall.sh
index af1e560..e283c9e 100755
--- a/src/usbinstall.sh
+++ b/src/usbinstall.sh
@@ -354,9 +354,11 @@ else
    cp $ISOMOUNTDIR/boot/isolinux/* boot/
    mv boot/isolinux.cfg boot/extlinux.conf
    sed -i "s|root=[^[:space:]]*|root=live:/openmamba_live/openmamba-live.iso|" boot/extlinux.conf
-   cp /usr/share/syslinux/{libcom32,libutil,vesamenu}.c32 boot/ || {
-      errorAndExit $"Error: can't copy some files to /boot directory"
-   }
+   for f in /usr/share/syslinux/{libcom32,libutil,vesamenu}.c32; do
+      if [ -r $f ]; then
+         cp $f boot/ || errorAndExit $"Error: can't copy bootloader file(s) to /boot directory"
+      fi
+   done
    rm -f boot/isolinux*
    umount $ISOMOUNTDIR
    rmdir $ISOMOUNTDIR