rpms/livecd-tools/EL-5 livecd-tools-013-extlinux-i.patch, NONE, 1.1 livecd-tools.spec, 1.19, 1.20

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/livecd-tools/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30403

Modified Files:
	livecd-tools.spec 
Added Files:
	livecd-tools-013-extlinux-i.patch 
Log Message:
* Mon Oct 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 013-8.1
- Fix invocation of extlinux


livecd-tools-013-extlinux-i.patch:

--- NEW FILE livecd-tools-013-extlinux-i.patch ---
Call older extlinux correctly.

Lubomir Rintel <lkundrak at v3.sk>

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
 


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/EL-5/livecd-tools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- livecd-tools.spec	31 Aug 2008 13:51:23 -0000	1.19
+++ livecd-tools.spec	27 Oct 2008 11:31:13 -0000	1.20
@@ -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 @@
 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 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 make
@@ -69,6 +71,9 @@
 %{python_sitelib}/imgcreate/*
 
 %changelog
+* Mon Oct 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 013-8.1
+- Fix invocation of extlinux
+
 * Sun Aug 03 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 013-8
 - Fix ksconfigs, fix building and naming of patches