usbinstall: don't fail if a syslinux module is missing, to allow using both versions 4 and 5

This commit is contained in:
Silvan Calarco 2013-08-13 14:58:47 +02:00
parent e0722873e5
commit 89c5e1a8cd

View File

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