rpms/livecd-tools/devel livecd-tools-027-make-liveusb-work-damnit.patch, NONE, 1.1 livecd-tools.spec, 1.30, 1.31

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/livecd-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26900

Modified Files:
	livecd-tools.spec 
Added Files:
	livecd-tools-027-make-liveusb-work-damnit.patch 
Log Message:
- test patch to make LiveUSB work again, need to be sure it doesn't
  break LiveCD before committing in the next version


livecd-tools-027-make-liveusb-work-damnit.patch:
 live.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE livecd-tools-027-make-liveusb-work-damnit.patch ---
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 85de975..ed3d563 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -416,7 +416,7 @@ menu hiddenrow 5
 
     def __get_image_stanza(self, is_xen, isDracut, **args):
         if isDracut:
-            args["rootlabel"] = "live:LABEL=%(fslabel)s" % args
+            args["rootlabel"] = "live:CDLABEL=%(fslabel)s" % args
         else:
             args["rootlabel"] = "CDLABEL=%(fslabel)s" % args
 


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/livecd-tools.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- livecd-tools.spec	10 Sep 2009 20:09:59 -0000	1.30
+++ livecd-tools.spec	15 Sep 2009 21:36:45 -0000	1.31
@@ -5,11 +5,12 @@
 Summary: Tools for building live CDs
 Name: livecd-tools
 Version: 027
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/livecd
 Source0: %{name}-%{version}.tar.bz2
+Patch0: livecd-tools-027-make-liveusb-work-damnit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-imgcreate = %{version}-%{release}
 Requires: mkisofs
@@ -51,6 +52,7 @@ like live image or appliances.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make
@@ -81,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Tue Sep 15 2009 Warren Togami <wtogami at redhat.com> - 027-2
+- test patch to make LiveUSB work again, need to be sure it doesn't
+  break LiveCD before committing in the next version
+
 * Thu Sep 10 2009 Warren Togami <wtogami at redhat.com> - 027-1
 - Support new dracut output filename /boot/initramfs-*
 - Fix cleanup of fake /selinux directory during teardown Bug #522224