- test patch to make LiveUSB work again, need to be sure it doesn't break

LiveCD before committing in the next version
epel9
Warren Togami 16 years ago
parent f92c633f9b
commit 317dfb1fd4

@ -0,0 +1,13 @@
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

@ -5,11 +5,12 @@
Summary: Tools for building live CDs Summary: Tools for building live CDs
Name: livecd-tools Name: livecd-tools
Version: 027 Version: 027
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Base Group: System Environment/Base
URL: http://git.fedorahosted.org/git/livecd URL: http://git.fedorahosted.org/git/livecd
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Patch0: livecd-tools-027-make-liveusb-work-damnit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: python-imgcreate = %{version}-%{release} Requires: python-imgcreate = %{version}-%{release}
Requires: mkisofs Requires: mkisofs
@ -51,6 +52,7 @@ like live image or appliances.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
make make
@ -81,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/imgcreate/*.pyc %{python_sitelib}/imgcreate/*.pyc
%changelog %changelog
* Tue Sep 15 2009 Warren Togami <wtogami@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@redhat.com> - 027-1 * Thu Sep 10 2009 Warren Togami <wtogami@redhat.com> - 027-1
- Support new dracut output filename /boot/initramfs-* - Support new dracut output filename /boot/initramfs-*
- Fix cleanup of fake /selinux directory during teardown Bug #522224 - Fix cleanup of fake /selinux directory during teardown Bug #522224

Loading…
Cancel
Save