diff --git a/livecd-tools-013-extlinux-i.patch b/livecd-tools-013-extlinux-i.patch new file mode 100644 index 0000000..1c2e46f --- /dev/null +++ b/livecd-tools-013-extlinux-i.patch @@ -0,0 +1,23 @@ +Call older extlinux correctly. + +Lubomir Rintel + +diff -up livecd-tools-013/tools/livecd-iso-to-disk.sh.extlinux-i livecd-tools-013/tools/livecd-iso-to-disk.sh +--- livecd-tools-013/tools/livecd-iso-to-disk.sh.extlinux-i 2008-10-27 12:29:08.000000000 +0100 ++++ livecd-tools-013/tools/livecd-iso-to-disk.sh 2008-10-27 12:29:14.000000000 +0100 +@@ -241,10 +241,14 @@ if [ "$USBFS" = "vfat" -o "$USBFS" = "ms + syslinux $USBDEV + fi + elif [ "$USBFS" = "ext2" -o "$USBFS" = "ext3" ]; then ++ # check if extlinux accepts -i option ++ extlinux -i -h 2>/dev/null ++ [ $? = 64 ] && I= || I=-i ++ + # extlinux expects the config to be named extlinux.conf + # and has to be run with the file system mounted + mv $USBMNT/$SYSLINUXPATH/isolinux.cfg $USBMNT/$SYSLINUXPATH/extlinux.conf +- extlinux -i $USBMNT/syslinux ++ extlinux $I $USBMNT/$SYSLINUXPATH + cleanup + fi + diff --git a/livecd-tools.spec b/livecd-tools.spec index 452ea01..db3abce 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -4,7 +4,7 @@ Summary: Tools for building live CD's Name: livecd-tools Version: 013 -Release: 8%{?dist} +Release: 8%{?dist}.1 License: GPLv2+ Group: System Environment/Base URL: http://git.fedoraproject.org/?p=hosted/livecd @@ -14,6 +14,7 @@ Patch0: livecd-tools-013-old-pykickstart.patch Patch1: livecd-tools-013-try-finally.patch Patch2: livecd-tools-013-iso-to-disk-path.patch Patch3: livecd-tools-013-ksconfigs.patch +Patch4: livecd-tools-013-extlinux-i.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: util-linux Requires: coreutils @@ -45,6 +46,7 @@ http://fedoraproject.org/wiki/FedoraLiveCD for more details. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build make @@ -69,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/* %changelog +* Mon Oct 27 2008 Lubomir Rintel - 013-8.1 +- Fix invocation of extlinux + * Sun Aug 03 2008 Jeroen van Meeuwen - 013-8 - Fix ksconfigs, fix building and naming of patches