From af39048a80480bba689fe96c767b0f523c38c0af Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 26 Jun 2013 23:15:26 +0300 Subject: [PATCH] create_livestick: use our *.c32 we should never trust people's host syslinux --- .../tools/syslinux/files/create_livestick | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/packages/tools/syslinux/files/create_livestick b/packages/tools/syslinux/files/create_livestick index 3ea77dceee..1fa23ed5b5 100755 --- a/packages/tools/syslinux/files/create_livestick +++ b/packages/tools/syslinux/files/create_livestick @@ -239,26 +239,9 @@ EOF cp splash.png /tmp/usb_install - if [ -f /usr/lib/syslinux/vesamenu.c32 ]; then - cp /usr/lib/syslinux/vesamenu.c32 /tmp/usb_install - elif [ -f /usr/share/syslinux/vesamenu.c32 ]; then - cp /usr/share/syslinux/vesamenu.c32 /tmp/usb_install - else - echo "ERROR: Can't find syslinux's vesamenu.c32 on Host OS" >&2 - sed 's|^UI vesamenu.c32|#UI vesamenu.c32|g' /tmp/usb_install/syslinux.cfg - fi - - if [ -f /usr/lib/syslinux/libcom32.c32 ]; then - cp /usr/lib/syslinux/libcom32.c32 /tmp/usb_install - elif [ -f /usr/share/syslinux/libcom32.c32 ]; then - cp /usr/share/syslinux/libcom32.c32 /tmp/usb_install - fi - - if [ -f /usr/lib/syslinux/libutil.c32 ]; then - cp /usr/lib/syslinux/libutil.c32 /tmp/usb_install - elif [ -f /usr/share/syslinux/libutil.c32 ]; then - cp /usr/share/syslinux/libutil.c32 /tmp/usb_install - fi + cp 3rdparty/syslinux/vesamenu.c32 /tmp/usb_install + cp 3rdparty/syslinux/libcom32.c32 /tmp/usb_install + cp 3rdparty/syslinux/libutil.c32 /tmp/usb_install # sync disk echo "syncing disk..."