Makefile|2 +-
livecd-tools.spec |6 +-
tools/livecd-iso-to-disk.sh | 11 +++
3 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit e3424b8e3dbceb297f34083b12a699e7084ea542
Author: Jeremy Katz
Date: Wed May 27 10:11:21 2009 -0400
Bump version
diff --git a/Makefile b/Makefile
index c790cc2..9d67228 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 017.2
+VERSION = 017.3
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
diff --git a/livecd-tools.spec b/livecd-tools.spec
index c6198c2..62224a9 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -4,7 +4,7 @@
Summary: Tools for building live CD's
Name: livecd-tools
-Version: 017.2
+Version: 017.3
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -62,6 +62,10 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/imgcreate/*.pyc
%changelog
+* Wed May 27 2009 Jeremy Katz - 017.3-1
+- Backport livecd-iso-to-disk change to work around com32's lack of
+ abi guarantees (#492370, #498155)
+
* Fri Dec 19 2008 Jeremy Katz - 017.2-1
- Add newkey repo (#477067)
- Fix --base-on even more
commit 617dffce568c914200ee3ef8cad9aea85e2706bb
Author: Jeremy Katz
Date: Thu Apr 2 16:57:13 2009 -0400
[BACKPORT] Use our syslinux's menu com32 modules (#492370)
com32 modules in syslinux don't seem to have a consistent API, so
let's workaround it by copying in the menu files from our syslinux
when doing livecd-iso-to-disk. This is kind of kludgey, really :/
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 85e097b..ccd17e6 100644
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -297,6 +297,17 @@ if [ -n "$overlaysizemb" ]; then
fi
echo "Installing boot loader"
+# this is a bit of a kludge, but syslinux doesn't guarantee the API for its
com32 modules :/
+if [ -f $USBMNT/$SYSLINUXPATH/vesamenu.c32 -a -f
/usr/share/syslinux/vesamenu.c32 ]; then
+ cp /usr/share/syslinux/vesamenu.c32 $USBMNT/$SYSLINUXPATH/vesamenu.c32
+elif [ -f $USBMNT/$SYSLINUXPATH/vesamenu.c32 -a -f
/usr/lib/syslinux/vesamenu.c32 ]; then
+ cp /usr/lib/syslinux/vesamenu.c32 $USBMNT/$SYSLINUXPATH/vesamenu.c32
+elif [ -f $USBMNT/$SYSLINUXPATH/menu.c32 -a -f /usr/share/syslinux/menu.c32 ];
then
+ cp /usr/share/syslinux/menu.c32 $USBMNT/$SYSLINUXPATH/menu.c32
+elif [ -f $USBMNT/$SYSLINUXPATH/menu.c32 -a -f /usr/lib/syslinux/menu.c32 ];
then
+ cp /usr/lib/syslinux/menu.c32 $USBMNT/$SYSLINUXPATH/menu.c32
+fi
+
if [ "$USBFS" = "vfat" -o "$USBFS" = "msdos" ]; then
# syslinux expects the config to be named syslinux.cfg
# and has to run with the file system unmounted
--
Fedora-livecd-list mailing list
Fedora-livecd-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-livecd-list
