rpms/livecd-tools/F-7 isotostick.sh, 1.1, 1.2 livecd-tools.spec, 1.10, 1.11

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/rpms/livecd-tools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21371

Modified Files:
	isotostick.sh livecd-tools.spec 
Log Message:
* Mon Nov  5 2007 Jeremy Katz <katzj at redhat.com> - 009-3
- And fix to actually work with F7



Index: isotostick.sh
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-7/isotostick.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- isotostick.sh	5 Nov 2007 18:29:41 -0000	1.1
+++ isotostick.sh	5 Nov 2007 18:46:25 -0000	1.2
@@ -173,10 +173,10 @@
     usage
 fi
 
-if [ -z "$noverify" ]; then
+if [ -z "$noverify" -a -x /usr/lib/anaconda-runtime/checkisomd5 ]; then
     # verify the image
     echo "Verifying image..."
-    checkisomd5 --verbose $ISO
+    /usr/lib/anaconda-runtime/checkisomd5 --verbose $ISO
     if [ $? -ne 0 ]; then
 	echo "Are you SURE you want to continue?"
 	echo "Press Enter to continue or ctrl-c to abort"


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-7/livecd-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- livecd-tools.spec	5 Nov 2007 18:29:41 -0000	1.10
+++ livecd-tools.spec	5 Nov 2007 18:46:25 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Tools for building live CD's
 Name: livecd-tools
 Version: 009
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://git.fedoraproject.org/?p=hosted/livecd
@@ -51,6 +51,9 @@
 %{_datadir}/livecd-tools/*
 
 %changelog
+* Mon Nov  5 2007 Jeremy Katz <katzj at redhat.com> - 009-3
+- And fix to actually work with F7
+
 * Mon Nov  5 2007 Jeremy Katz <katzj at redhat.com> - 009-2
 - Push new livecd-iso-to-disk that works with Fedora 8 live images