tools/livecd-iso-to-disk.sh | 2 ++
tools/livecd-iso-to-pxeboot.sh | 8 +++++---
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit b6c69841c1e372173b8633cbd9ede0baa7847aba
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Fri Mar 20 10:46:49 2009 -0400
Handle changed syslinux paths for livecd-iso-to-pxeboot as well
diff --git a/tools/livecd-iso-to-pxeboot.sh b/tools/livecd-iso-to-pxeboot.sh
index 280d354..22810d9 100755
--- a/tools/livecd-iso-to-pxeboot.sh
+++ b/tools/livecd-iso-to-pxeboot.sh
@@ -42,8 +42,8 @@ if [ $(id -u) != 0 ]; then
fi
# Check pxelinux.0 exists.
-if [ ! -f /usr/lib/syslinux/pxelinux.0 ]; then
- echo "Warning: /usr/lib/syslinux/pxelinux.0 not found."
+if [ ! -f /usr/share/syslinux/pxelinux.0 -a ! -f /usr/lib/syslinux/pxelinux.0 ]; then
+ echo "Warning: pxelinux.0 not found."
echo "Make sure syslinux or pxelinux is installed on this system."
fi
@@ -95,7 +95,9 @@ ISODIRNAME=`dirname "$ISO"`
cp $CDMNT/isolinux/vmlinuz0 tftpboot/vmlinuz0
# pxelinux bootloader.
-if [ -f /usr/lib/syslinux/pxelinux.0 ]; then
+if [ -f /usr/share/syslinux/pxelinux.0 ]; then
+ cp /usr/share/syslinux/pxelinux.0 tftpboot
+elif [ -f /usr/lib/syslinux/pxelinux.0 ]; then
cp /usr/lib/syslinux/pxelinux.0 tftpboot
else
echo "Warning: You need to add pxelinux.0 to tftpboot/ subdirectory"
commit d2c2a0c911090cb55e56e207fba0fa472913e5dd
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Fri Mar 20 10:44:09 2009 -0400
Don't prompt about overwriting files from mtools (#491234)
New syslinux uses mtools for the installer and then mmove prompts about
overwriting the existing ldlinux.sys. So let's just remove it as
there's not a good way to force mmove to not ask
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index f840c6e..f0c7331 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -654,6 +654,8 @@ if [ -z "$multi" ]; then
# syslinux expects the config to be named syslinux.cfg
# and has to run with the file system unmounted
mv $USBMNT/$SYSLINUXPATH/isolinux.cfg $USBMNT/$SYSLINUXPATH/syslinux.cfg
+ # deal with mtools complaining about ldlinux.sys
+ if [ -f $USBMNT/$SYSLINUXPATH/ldlinux.sys ] ; then rm -f
$USBMNT/$SYSLINUXPATH/ldlinux.sys ; fi
cleanup
if [ -n "$SYSLINUXPATH" ]; then
syslinux -d $SYSLINUXPATH $USBDEV
Show replies by date