From 0badd661fea750639c87e0fbeeec1a7badd8fa59 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Mon, 19 Oct 2009 19:23:33 +0000 Subject: [PATCH 01/45] - Tell dracut not to ask for LUKS passwords or activate mdraid sets - Silence the /etc/modprobe.conf deprecation warning --- .cvsignore | 2 +- livecd-tools.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0c8f8d0..aebd4fc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -livecd-tools-028.tar.bz2 +livecd-tools-029.tar.bz2 diff --git a/livecd-tools.spec b/livecd-tools.spec index f1321e3..c95ce6f 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -4,12 +4,13 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 028 +Version: 029 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd Source0: %{name}-%{version}.tar.bz2 +Patch0: livecd-modprobe.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 +* Mon Oct 19 2009 Warren Togami - 029-1 +- Tell dracut not to ask for LUKS passwords or activate mdraid sets +- Silence the /etc/modprobe.conf deprecation warning + * Wed Sep 16 2009 Warren Togami - 028-1 - Fix LiveUSB with live images - Fix display of free space during livecd-iso-to-disk error (farrell) diff --git a/sources b/sources index bc8b0be..d8ef0d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc6acb74d1cd29a1e33faa1d3c40121e livecd-tools-028.tar.bz2 +3f27a366e72a14ca177502b13ddc0491 livecd-tools-029.tar.bz2 From 2fcd7f90d79447dae9f18e385e8e8b6dc7e1f87a Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Tue, 20 Oct 2009 02:25:22 +0000 Subject: [PATCH 02/45] make it actually work --- .cvsignore | 2 +- livecd-tools.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index aebd4fc..b60845b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -livecd-tools-029.tar.bz2 +livecd-tools-030.tar.bz2 diff --git a/livecd-tools.spec b/livecd-tools.spec index c95ce6f..020c9a0 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -4,7 +4,7 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 029 +Version: 030 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -83,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog -* Mon Oct 19 2009 Warren Togami - 029-1 +* Mon Oct 19 2009 Warren Togami - 030-1 - Tell dracut not to ask for LUKS passwords or activate mdraid sets - Silence the /etc/modprobe.conf deprecation warning diff --git a/sources b/sources index d8ef0d7..4a340e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3f27a366e72a14ca177502b13ddc0491 livecd-tools-029.tar.bz2 +36dd8554f89bc3230cb939f06caa66af livecd-tools-030.tar.bz2 From 26b8d33947d3bcbefc1da2f841db8639cac35ef4 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Tue, 20 Oct 2009 02:26:53 +0000 Subject: [PATCH 03/45] no patch --- livecd-tools.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index 020c9a0..dd83404 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -10,7 +10,6 @@ License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd Source0: %{name}-%{version}.tar.bz2 -Patch0: livecd-modprobe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs @@ -52,7 +51,6 @@ like live image or appliances. %prep %setup -q -%patch0 -p1 %build make From 5d7055ea604c3e38644500daae32ca5dfe3db95a Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Tue, 3 Nov 2009 18:35:46 +0000 Subject: [PATCH 04/45] livecd-iso-to-disk capable of installing installer DVD to USB --- .cvsignore | 2 +- livecd-tools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b60845b..30d66cf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -livecd-tools-030.tar.bz2 +livecd-tools-031.tar.bz2 diff --git a/livecd-tools.spec b/livecd-tools.spec index dd83404..854ab10 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -4,7 +4,7 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 030 +Version: 031 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Tue Nov 03 2009 Warren Togami - 031-1 +- livecd-iso-to-disk capable of installing installer DVD to USB + * Mon Oct 19 2009 Warren Togami - 030-1 - Tell dracut not to ask for LUKS passwords or activate mdraid sets - Silence the /etc/modprobe.conf deprecation warning diff --git a/sources b/sources index 4a340e2..f810b48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36dd8554f89bc3230cb939f06caa66af livecd-tools-030.tar.bz2 +09527ef6a628b12dae2c7c16812560fd livecd-tools-031.tar.bz2 From 9dbc99144fe9f50434a33504e46f5934892a8b51 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:32 +0000 Subject: [PATCH 05/45] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e202788..f28a5b6 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: livecd-tools -# $Id$ +# $Id: Makefile,v 1.1 2007/03/23 18:02:39 wtogami Exp $ NAME := livecd-tools SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From ee15b378057fe6b24978a9ac732fd3dfe9f81a69 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:57:37 +0000 Subject: [PATCH 06/45] Initialize branch F-13 for livecd-tools --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 3152b9e877709956b5ab594ca28d8ace14c7e7db Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 May 2010 21:35:41 +0000 Subject: [PATCH 07/45] - Rebuild --- livecd-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index 854ab10..954ef42 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 031 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Fri May 07 2010 Jesse Keating - 031-1.1 +- Rebuild + * Tue Nov 03 2009 Warren Togami - 031-1 - livecd-iso-to-disk capable of installing installer DVD to USB From 420b5200fd998cec509f17cf034efd2db6024b10 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 19 Jun 2010 17:48:09 +0000 Subject: [PATCH 08/45] Update to 032 and require parted. --- .cvsignore | 2 +- livecd-tools.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 30d66cf..9281c32 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -livecd-tools-031.tar.bz2 +livecd-tools-032.tar.bz2 diff --git a/livecd-tools.spec b/livecd-tools.spec index 854ab10..1f65175 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -4,7 +4,7 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 031 +Version: 032 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs Requires: isomd5sum +Requires: parted %ifarch %{ix86} x86_64 Requires: syslinux %endif @@ -81,6 +82,13 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Sat Jun 19 2010 Bruno Wolff III - 032-1 +- Added support for specifying compressors +- Add Requires for parted - Bug 605639 +- Add rd_NO_DM dracut cmdline options - Bug 589783 +- See http://git.fedorahosted.org/git/?p=livecd;a=shortlog for a list of + upstream commits since 031 was tagged. + * Tue Nov 03 2009 Warren Togami - 031-1 - livecd-iso-to-disk capable of installing installer DVD to USB diff --git a/sources b/sources index f810b48..aff16c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09527ef6a628b12dae2c7c16812560fd livecd-tools-031.tar.bz2 +1a213d4a148a140178e72cd357d5ec0f livecd-tools-032.tar.bz2 From 661f001f0788c040257daf8146569c9f02bfaea8 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 19 Jun 2010 18:22:16 +0000 Subject: [PATCH 09/45] Fix prefix in tar archive and document producing it from git archive. --- livecd-tools.spec | 9 ++++++++- sources | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index 1f65175..d07b0bf 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,10 +5,14 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 032 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd +# To make source tar ball: +# git clone git://git.fedorahosted.org/livecd +# cd livecd +# git archive --prefix livecd-tools-VERSION/ livecd-tools-VERSION | bzip2 > livecd-tools-VERSION.tar.bz2 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} @@ -82,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Sat Jun 19 2010 Bruno Wolff III - 032-2 +- Fix tar prefix and document how to make it + * Sat Jun 19 2010 Bruno Wolff III - 032-1 - Added support for specifying compressors - Add Requires for parted - Bug 605639 diff --git a/sources b/sources index aff16c8..f29e3be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a213d4a148a140178e72cd357d5ec0f livecd-tools-032.tar.bz2 +73188a50597f90c7e51c11108292e38e livecd-tools-032.tar.bz2 From 691758fb74700a6ca5798e6e22bbcf40a971bce1 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 19 Jun 2010 18:45:04 +0000 Subject: [PATCH 10/45] The Makefile needed to have a hardcoded version change and I modified the instructions for making the tar achive. --- livecd-tools.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index d07b0bf..17d0a92 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -12,7 +12,7 @@ URL: http://git.fedorahosted.org/git/livecd # To make source tar ball: # git clone git://git.fedorahosted.org/livecd # cd livecd -# git archive --prefix livecd-tools-VERSION/ livecd-tools-VERSION | bzip2 > livecd-tools-VERSION.tar.bz2 +# make dist Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} diff --git a/sources b/sources index f29e3be..f3cf224 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -73188a50597f90c7e51c11108292e38e livecd-tools-032.tar.bz2 +5a5e8418d67705ee0d850a58844c36ee livecd-tools-032.tar.bz2 From fa2c06c4568d8565c114f9153f3511ac401e4da1 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 19 Jun 2010 18:48:27 +0000 Subject: [PATCH 11/45] Bump release --- livecd-tools.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/livecd-tools.spec b/livecd-tools.spec index 17d0a92..323d60a 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Sat Jun 19 2010 Bruno Wolff III - 032-3 +- Change the version in the Makefile + * Sat Jun 19 2010 Bruno Wolff III - 032-2 - Fix tar prefix and document how to make it From 899f211961663a7834309198a1e287eba0455a41 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 19 Jun 2010 18:49:35 +0000 Subject: [PATCH 12/45] And not just in the changelog comment. --- livecd-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index 323d60a..76334cb 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 032 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd From 21d29b5e2e5ee32dc570cb32f247018a8aa4b2fc Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 19 Jun 2010 19:00:28 +0000 Subject: [PATCH 13/45] liveimage-mount is a new executable in 032 that needs to be packaged. --- livecd-tools.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index 76334cb..0512687 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 032 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -76,6 +76,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/livecd-iso-to-disk %{_bindir}/livecd-iso-to-pxeboot %{_bindir}/image-creator +%{_bindir}/liveimage-mount %files -n python-imgcreate %defattr(-,root,root,-) @@ -86,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Sat Jun 19 2010 Bruno Wolff III - 032-4 +- liveimage-mount is new to 023 + * Sat Jun 19 2010 Bruno Wolff III - 032-3 - Change the version in the Makefile From 963b991d3084464d805b53c7f1b7c74ad0283353 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 02:25:10 +0000 Subject: [PATCH 14/45] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- livecd-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index 0512687..b31f195 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 032 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Wed Jul 21 2010 David Malcolm - 032-5 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Sat Jun 19 2010 Bruno Wolff III - 032-4 - liveimage-mount is new to 023 From 7cf3dc9b1bc738704b5ab3752f2f3ef3aea92b20 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 27 Jul 2010 10:38:25 +0000 Subject: [PATCH 15/45] Update to 033. --- .cvsignore | 2 +- livecd-tools.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9281c32..5683018 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -livecd-tools-032.tar.bz2 +livecd-tools-033.tar.bz2 diff --git a/livecd-tools.spec b/livecd-tools.spec index b31f195..a9d43b5 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -4,8 +4,8 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 032 -Release: 5%{?dist} +Version: 033 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -87,6 +87,11 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Sat Jun 19 2010 Bruno Wolff III - 033-1 +- Fix for vesa splash file change for bz 617115. +- Use lazy umounts as a work around for bz 617844. +- Better handling of Environment exceptions for bz 551932. + * Wed Jul 21 2010 David Malcolm - 032-5 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild diff --git a/sources b/sources index f3cf224..2f94d10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5a5e8418d67705ee0d850a58844c36ee livecd-tools-032.tar.bz2 +c97450474ed17f1e068aaaaf863ddee7 livecd-tools-033.tar.bz2 From 66fe36f882623c785fead9a13f5b3df5b0bf6315 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 27 Jul 2010 10:41:58 +0000 Subject: [PATCH 16/45] Fix changelog date. --- livecd-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index a9d43b5..d83da70 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -87,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog -* Sat Jun 19 2010 Bruno Wolff III - 033-1 +* Tue Jul 27 2010 Bruno Wolff III - 033-1 - Fix for vesa splash file change for bz 617115. - Use lazy umounts as a work around for bz 617844. - Better handling of Environment exceptions for bz 551932. From 39ca62f8536d9eb309b6ada74b1b85342cfd25ed Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 27 Jul 2010 14:05:39 +0000 Subject: [PATCH 17/45] A thinko about what squashfs calls gzip compression was pointed out and livecd-tools was changed to substitute 'gzip' for 'zlib' throughout. This was committed upstream, but is handled here by a patch until the next upstream rollup. --- gzip.patch | 58 +++++++++++++++++++++++++++++++++++++++++++++++ livecd-tools.spec | 8 ++++++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 gzip.patch diff --git a/gzip.patch b/gzip.patch new file mode 100644 index 0000000..6d1762f --- /dev/null +++ b/gzip.patch @@ -0,0 +1,58 @@ +diff --git a/docs/livecd-creator.pod b/docs/livecd-creator.pod +index 880ae19..e80a119 100644 +--- a/docs/livecd-creator.pod ++++ b/docs/livecd-creator.pod +@@ -42,8 +42,8 @@ Defines the file system label. The default is based on the configuration name. + + =item --compression-type=COMPRESSOR + +-Specify a compressor recognized by mksquashfs. The default is zlib. lzma +-currently requires a custom kernel to produce a functional image. If zlib ++Specify a compressor recognized by mksquashfs. The default is gzip. lzma ++currently requires a custom kernel to produce a functional image. If gzip + is used, the -comp option is not passed to mksquashfs to allow the use of + older versions of mksquashfs. + +diff --git a/imgcreate/fs.py b/imgcreate/fs.py +index c5cd18b..554d1b9 100644 +--- a/imgcreate/fs.py ++++ b/imgcreate/fs.py +@@ -41,8 +41,8 @@ def makedirs(dirname): + raise + + def mksquashfs(in_img, out_img, compress_type): +-# Allow zlib to work for older versions of mksquashfs +- if compress_type == "zlib": ++# Allow gzip to work for older versions of mksquashfs ++ if compress_type == "gzip": + args = ["/sbin/mksquashfs", in_img, out_img] + else: + args = ["/sbin/mksquashfs", in_img, out_img, "-comp", compress_type] +diff --git a/imgcreate/live.py b/imgcreate/live.py +index 36fef63..f349a1f 100644 +--- a/imgcreate/live.py ++++ b/imgcreate/live.py +@@ -46,7 +46,7 @@ class LiveImageCreatorBase(LoopImageCreator): + """ + LoopImageCreator.__init__(self, *args) + +- self.compress_type = "zlib" ++ self.compress_type = "gzip" + """mksquashfs compressor to use.""" + + self.skip_compression = False +diff --git a/tools/livecd-creator b/tools/livecd-creator +index 79fc944..d1727c5 100755 +--- a/tools/livecd-creator ++++ b/tools/livecd-creator +@@ -42,8 +42,8 @@ def parse_options(args): + imgopt.add_option("-f", "--fslabel", type="string", dest="fs_label", + help="File system label (default based on config name)") + imgopt.add_option("", "--compression-type", type="string", dest="compress_type", +- help="Compression type recognized by mksquashfs (default zlib, lzma needs custom kernel)", +- default="zlib") ++ help="Compression type recognized by mksquashfs (default gzip, lzma needs custom kernel)", ++ default="gzip") + parser.add_option_group(imgopt) + + # options related to the config of your system diff --git a/livecd-tools.spec b/livecd-tools.spec index d83da70..afc36d1 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 033 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -14,6 +14,8 @@ URL: http://git.fedorahosted.org/git/livecd # cd livecd # make dist Source0: %{name}-%{version}.tar.bz2 +# Temporary patch until next livecd-tools rollup +Patch0: gzip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs @@ -56,6 +58,7 @@ like live image or appliances. %prep %setup -q +%patch0 -p1 %build make @@ -87,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Tue Jul 27 2010 Bruno Wolff III - 033-2 +- Replace 'zlib' with 'gzip' to fix thinko about the compressor name. + * Tue Jul 27 2010 Bruno Wolff III - 033-1 - Fix for vesa splash file change for bz 617115. - Use lazy umounts as a work around for bz 617844. From e8fc9104198090a07d7cf578b009e6e991abdcc7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 02:28:40 +0000 Subject: [PATCH 18/45] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index f28a5b6..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: livecd-tools -# $Id: Makefile,v 1.1 2007/03/23 18:02:39 wtogami Exp $ -NAME := livecd-tools -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From ea231550350c8395789a579ec023fbcf24c5d8c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 02:28:46 +0000 Subject: [PATCH 19/45] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index f28a5b6..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: livecd-tools -# $Id: Makefile,v 1.1 2007/03/23 18:02:39 wtogami Exp $ -NAME := livecd-tools -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 1d83a013527637b36de1b491258f932d0d496e76 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 30 Jul 2010 21:12:07 -0500 Subject: [PATCH 20/45] Since the previous update go replaced by the out of date python build and another rebuild is needed for the python change. --- livecd-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index afc36d1..39956cd 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 033 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Tue Jul 30 2010 Bruno Wolff III - 033-3 +- The previous update got replaced by the python update; another bump is needed. + * Tue Jul 27 2010 Bruno Wolff III - 033-2 - Replace 'zlib' with 'gzip' to fix thinko about the compressor name. From 22ae9ad86cca07eeb2e0c1de8f3955eed6ff64aa Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 17 Aug 2010 22:31:55 -0500 Subject: [PATCH 21/45] Backport 033-2 to F13 so that people can build F14 repos on F13. --- gzip.patch | 58 +++++++++++++++++++++++++++++++++++++++++++++++ livecd-tools.spec | 44 +++++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 gzip.patch diff --git a/gzip.patch b/gzip.patch new file mode 100644 index 0000000..6d1762f --- /dev/null +++ b/gzip.patch @@ -0,0 +1,58 @@ +diff --git a/docs/livecd-creator.pod b/docs/livecd-creator.pod +index 880ae19..e80a119 100644 +--- a/docs/livecd-creator.pod ++++ b/docs/livecd-creator.pod +@@ -42,8 +42,8 @@ Defines the file system label. The default is based on the configuration name. + + =item --compression-type=COMPRESSOR + +-Specify a compressor recognized by mksquashfs. The default is zlib. lzma +-currently requires a custom kernel to produce a functional image. If zlib ++Specify a compressor recognized by mksquashfs. The default is gzip. lzma ++currently requires a custom kernel to produce a functional image. If gzip + is used, the -comp option is not passed to mksquashfs to allow the use of + older versions of mksquashfs. + +diff --git a/imgcreate/fs.py b/imgcreate/fs.py +index c5cd18b..554d1b9 100644 +--- a/imgcreate/fs.py ++++ b/imgcreate/fs.py +@@ -41,8 +41,8 @@ def makedirs(dirname): + raise + + def mksquashfs(in_img, out_img, compress_type): +-# Allow zlib to work for older versions of mksquashfs +- if compress_type == "zlib": ++# Allow gzip to work for older versions of mksquashfs ++ if compress_type == "gzip": + args = ["/sbin/mksquashfs", in_img, out_img] + else: + args = ["/sbin/mksquashfs", in_img, out_img, "-comp", compress_type] +diff --git a/imgcreate/live.py b/imgcreate/live.py +index 36fef63..f349a1f 100644 +--- a/imgcreate/live.py ++++ b/imgcreate/live.py +@@ -46,7 +46,7 @@ class LiveImageCreatorBase(LoopImageCreator): + """ + LoopImageCreator.__init__(self, *args) + +- self.compress_type = "zlib" ++ self.compress_type = "gzip" + """mksquashfs compressor to use.""" + + self.skip_compression = False +diff --git a/tools/livecd-creator b/tools/livecd-creator +index 79fc944..d1727c5 100755 +--- a/tools/livecd-creator ++++ b/tools/livecd-creator +@@ -42,8 +42,8 @@ def parse_options(args): + imgopt.add_option("-f", "--fslabel", type="string", dest="fs_label", + help="File system label (default based on config name)") + imgopt.add_option("", "--compression-type", type="string", dest="compress_type", +- help="Compression type recognized by mksquashfs (default zlib, lzma needs custom kernel)", +- default="zlib") ++ help="Compression type recognized by mksquashfs (default gzip, lzma needs custom kernel)", ++ default="gzip") + parser.add_option_group(imgopt) + + # options related to the config of your system diff --git a/livecd-tools.spec b/livecd-tools.spec index 954ef42..39956cd 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -4,16 +4,23 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 031 -Release: 1%{?dist}.1 +Version: 033 +Release: 3%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd +# To make source tar ball: +# git clone git://git.fedorahosted.org/livecd +# cd livecd +# make dist Source0: %{name}-%{version}.tar.bz2 +# Temporary patch until next livecd-tools rollup +Patch0: gzip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs Requires: isomd5sum +Requires: parted %ifarch %{ix86} x86_64 Requires: syslinux %endif @@ -51,6 +58,7 @@ like live image or appliances. %prep %setup -q +%patch0 -p1 %build make @@ -71,6 +79,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/livecd-iso-to-disk %{_bindir}/livecd-iso-to-pxeboot %{_bindir}/image-creator +%{_bindir}/liveimage-mount %files -n python-imgcreate %defattr(-,root,root,-) @@ -81,8 +90,35 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog -* Fri May 07 2010 Jesse Keating - 031-1.1 -- Rebuild +* Tue Jul 30 2010 Bruno Wolff III - 033-3 +- The previous update got replaced by the python update; another bump is needed. + +* Tue Jul 27 2010 Bruno Wolff III - 033-2 +- Replace 'zlib' with 'gzip' to fix thinko about the compressor name. + +* Tue Jul 27 2010 Bruno Wolff III - 033-1 +- Fix for vesa splash file change for bz 617115. +- Use lazy umounts as a work around for bz 617844. +- Better handling of Environment exceptions for bz 551932. + +* Wed Jul 21 2010 David Malcolm - 032-5 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Sat Jun 19 2010 Bruno Wolff III - 032-4 +- liveimage-mount is new to 023 + +* Sat Jun 19 2010 Bruno Wolff III - 032-3 +- Change the version in the Makefile + +* Sat Jun 19 2010 Bruno Wolff III - 032-2 +- Fix tar prefix and document how to make it + +* Sat Jun 19 2010 Bruno Wolff III - 032-1 +- Added support for specifying compressors +- Add Requires for parted - Bug 605639 +- Add rd_NO_DM dracut cmdline options - Bug 589783 +- See http://git.fedorahosted.org/git/?p=livecd;a=shortlog for a list of + upstream commits since 031 was tagged. * Tue Nov 03 2009 Warren Togami - 031-1 - livecd-iso-to-disk capable of installing installer DVD to USB diff --git a/sources b/sources index f810b48..2f94d10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09527ef6a628b12dae2c7c16812560fd livecd-tools-031.tar.bz2 +c97450474ed17f1e068aaaaf863ddee7 livecd-tools-033.tar.bz2 From 3999ba9765dc6104c5852d62751edbfceebd8256 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 11 Sep 2010 21:58:59 -0500 Subject: [PATCH 22/45] The gzip patch is included in the forthcoming upstream update. --- gzip.patch | 58 ------------------------------------------------------ 1 file changed, 58 deletions(-) delete mode 100644 gzip.patch diff --git a/gzip.patch b/gzip.patch deleted file mode 100644 index 6d1762f..0000000 --- a/gzip.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/docs/livecd-creator.pod b/docs/livecd-creator.pod -index 880ae19..e80a119 100644 ---- a/docs/livecd-creator.pod -+++ b/docs/livecd-creator.pod -@@ -42,8 +42,8 @@ Defines the file system label. The default is based on the configuration name. - - =item --compression-type=COMPRESSOR - --Specify a compressor recognized by mksquashfs. The default is zlib. lzma --currently requires a custom kernel to produce a functional image. If zlib -+Specify a compressor recognized by mksquashfs. The default is gzip. lzma -+currently requires a custom kernel to produce a functional image. If gzip - is used, the -comp option is not passed to mksquashfs to allow the use of - older versions of mksquashfs. - -diff --git a/imgcreate/fs.py b/imgcreate/fs.py -index c5cd18b..554d1b9 100644 ---- a/imgcreate/fs.py -+++ b/imgcreate/fs.py -@@ -41,8 +41,8 @@ def makedirs(dirname): - raise - - def mksquashfs(in_img, out_img, compress_type): --# Allow zlib to work for older versions of mksquashfs -- if compress_type == "zlib": -+# Allow gzip to work for older versions of mksquashfs -+ if compress_type == "gzip": - args = ["/sbin/mksquashfs", in_img, out_img] - else: - args = ["/sbin/mksquashfs", in_img, out_img, "-comp", compress_type] -diff --git a/imgcreate/live.py b/imgcreate/live.py -index 36fef63..f349a1f 100644 ---- a/imgcreate/live.py -+++ b/imgcreate/live.py -@@ -46,7 +46,7 @@ class LiveImageCreatorBase(LoopImageCreator): - """ - LoopImageCreator.__init__(self, *args) - -- self.compress_type = "zlib" -+ self.compress_type = "gzip" - """mksquashfs compressor to use.""" - - self.skip_compression = False -diff --git a/tools/livecd-creator b/tools/livecd-creator -index 79fc944..d1727c5 100755 ---- a/tools/livecd-creator -+++ b/tools/livecd-creator -@@ -42,8 +42,8 @@ def parse_options(args): - imgopt.add_option("-f", "--fslabel", type="string", dest="fs_label", - help="File system label (default based on config name)") - imgopt.add_option("", "--compression-type", type="string", dest="compress_type", -- help="Compression type recognized by mksquashfs (default zlib, lzma needs custom kernel)", -- default="zlib") -+ help="Compression type recognized by mksquashfs (default gzip, lzma needs custom kernel)", -+ default="gzip") - parser.add_option_group(imgopt) - - # options related to the config of your system From d5e09a089c7493cf7d60aa706d5ef3c792d2ce18 Mon Sep 17 00:00:00 2001 From: Jasper Hartline Date: Sat, 11 Sep 2010 22:00:05 -0500 Subject: [PATCH 23/45] mkbiarch will be coming with the new upstream update. Signed-off-by: Bruno Wolff III --- livecd-tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/livecd-tools.spec b/livecd-tools.spec index 39956cd..daca90f 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -80,6 +80,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/livecd-iso-to-pxeboot %{_bindir}/image-creator %{_bindir}/liveimage-mount +%{_bindir}/mkbiarch %files -n python-imgcreate %defattr(-,root,root,-) From 052db25e5bf7eb1b7024bbb71d92487e28db2b2b Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 11 Sep 2010 22:29:23 -0500 Subject: [PATCH 24/45] Update to 034. Lots of bug fixes. --- .gitignore | 1 + livecd-tools.spec | 25 ++++++++++++++++++++++--- sources | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5683018..0d14529 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ livecd-tools-033.tar.bz2 +/livecd-tools-034.tar.bz2 diff --git a/livecd-tools.spec b/livecd-tools.spec index daca90f..082ca34 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -4,8 +4,8 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 033 -Release: 3%{?dist} +Version: 034 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -13,7 +13,8 @@ URL: http://git.fedorahosted.org/git/livecd # git clone git://git.fedorahosted.org/livecd # cd livecd # make dist -Source0: %{name}-%{version}.tar.bz2 +# scp livecd*.tar.bz2 fedorahosted.org:livecd +Source0: http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2 # Temporary patch until next livecd-tools rollup Patch0: gzip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -91,6 +92,24 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Sat Sep 11 2010 Bruno Wolff III - 034-1 +- A new experimental script for creating live images. +- Handle partition devices that have a separator character in them. +- Initial checkin of a new expermiental tool for live backup images. +- Allow use of stage2 for repos to help with netinst ISOs. +- Fix issue with using netinst ISOs. +- Add support for ext4 now that syslinux supports it. +- Fix for enumerating loop devices using bash 4.1.7. +- Change --skipcopy to not overwrite other large areas. +- Add basic video driver option to syslinux/isolinux. +- Don't create sparse files one byte too large. +- Display progress information when copying image to USB devices. +- Set default boot language for USB images to the current locale. +- Use grep instead of depreceated egrep. +- Set up locale or there can be problems handling nonascii strings. +- Try normal umount before falling back to lazy umount. +- Allow creation of SELinux enabled LiveCD from an SELinux disabled system. + * Tue Jul 30 2010 Bruno Wolff III - 033-3 - The previous update got replaced by the python update; another bump is needed. diff --git a/sources b/sources index 2f94d10..89e73c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c97450474ed17f1e068aaaaf863ddee7 livecd-tools-033.tar.bz2 +601fe671670f7dcb68faebf443c05cba livecd-tools-034.tar.bz2 From 4170af47ab01e8f8b4f088f6f5f8c52977a282ea Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 11 Sep 2010 22:41:56 -0500 Subject: [PATCH 25/45] Take gzip patch reference out of the spec file. --- livecd-tools.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index 082ca34..73ffec6 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -15,8 +15,6 @@ URL: http://git.fedorahosted.org/git/livecd # make dist # scp livecd*.tar.bz2 fedorahosted.org:livecd Source0: http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2 -# Temporary patch until next livecd-tools rollup -Patch0: gzip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs From 3789039cfb263373d741b1a8d9a09d7b20721565 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 11 Sep 2010 22:43:04 -0500 Subject: [PATCH 26/45] Don't try to use the removed patch. Doh! --- livecd-tools.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index 73ffec6..62b0a54 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -57,7 +57,6 @@ like live image or appliances. %prep %setup -q -%patch0 -p1 %build make From a1883d6f199a29b8531631f3c54381478fd769b3 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sun, 12 Sep 2010 09:11:09 -0500 Subject: [PATCH 27/45] Add requires for pyparted for mkbiarch. --- livecd-tools.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index 62b0a54..d8005ad 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 034 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -20,6 +20,7 @@ Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs Requires: isomd5sum Requires: parted +Requires: pyparted %ifarch %{ix86} x86_64 Requires: syslinux %endif @@ -89,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Sun Sep 12 2010 Bruno Wolff III - 034-2 +- mkbiarch needs pyparted + * Sat Sep 11 2010 Bruno Wolff III - 034-1 - A new experimental script for creating live images. - Handle partition devices that have a separator character in them. From 983c635c53bc6deb14a5dc18bd52a2893e5a63b8 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 13 Sep 2010 20:50:20 -0500 Subject: [PATCH 28/45] Fix for vesa boot menu item --- livecd-tools.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index d8005ad..26a40e0 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 034 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -15,6 +15,7 @@ URL: http://git.fedorahosted.org/git/livecd # make dist # scp livecd*.tar.bz2 fedorahosted.org:livecd Source0: http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2 +Patch0: vesa.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs @@ -57,6 +58,7 @@ like live image or appliances. %prep +%patch0 -p1 %setup -q %build @@ -90,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Mon Sep 13 2010 Bruno Wolff III - 034-3 +- Backported fix for vesa boot menu item + * Sun Sep 12 2010 Bruno Wolff III - 034-2 - mkbiarch needs pyparted From a873a727a97f759009c18ff9af415133654d4598 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 13 Sep 2010 21:12:23 -0500 Subject: [PATCH 29/45] Need to commit the patch as well. --- vesa.patch | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 vesa.patch diff --git a/vesa.patch b/vesa.patch new file mode 100644 index 0000000..8afcfd9 --- /dev/null +++ b/vesa.patch @@ -0,0 +1,66 @@ +diff --git a/imgcreate/live.py b/imgcreate/live.py +index 1e0f117..e4e0c2e 100644 +--- a/imgcreate/live.py ++++ b/imgcreate/live.py +@@ -452,24 +452,12 @@ menu hiddenrow 5 + template = """label %(short)s + menu label %(long)s + kernel vmlinuz%(index)s +- append initrd=initrd%(index)s.img root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s +- +- +- label %(short)s +- menu label %(long)s %(basicvideo)s +- kernel vmlinuz%(index)s + append initrd=initrd%(index)s.img root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(xdriver)s %(extra)s + """ + else: + template = """label %(short)s + menu label %(long)s + kernel mboot.c32 +- append xen%(index)s.gz --- vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s --- initrd%(index)s.img +- +- +- label %(short)s +- menu label %(long)s %(basicvideo)s +- kernel mboot.c32 + append xen%(index)s.gz --- vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(xdriver)s %(extra)s --- initrd%(index)s.img + """ + return template % args +@@ -504,7 +492,7 @@ menu hiddenrow 5 + + # Basic video driver + basic = "system with basic video driver" +- xdriver = "xdriver=vesa" ++ xdriver = "xdriver=vesa nomodeset" + + + # tell dracut not to ask for LUKS passwords or activate mdraid sets +@@ -519,14 +507,25 @@ menu hiddenrow 5 + liveargs = kern_opts, + long = long, + short = "linux" + index, +- basicvideo = basic, +- xdriver = xdriver, ++ basicvideo = "", ++ xdriver = "", + extra = "", + index = index) + + if default: + cfg += "menu default\n" + ++ cfg += self.__get_image_stanza(is_xen, isDracut, ++ fslabel = self.fslabel, ++ isofstype = "auto", ++ liveargs = kern_opts, ++ long = long, ++ short = "linux" + index, ++ basicvideo = basic, ++ xdriver = xdriver, ++ extra = "", ++ index = index) ++ + if checkisomd5: + cfg += self.__get_image_stanza(is_xen, isDracut, + fslabel = self.fslabel, From a8e3cfbde7ba983eadbf24bf4fd42f589b6370c7 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 13 Sep 2010 21:22:16 -0500 Subject: [PATCH 30/45] Fix spec file oops --- livecd-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index 26a40e0..c191701 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -58,8 +58,8 @@ like live image or appliances. %prep -%patch0 -p1 %setup -q +%patch0 -p1 %build make From 898f80298a67fab2bdcba772c49e54f8f090c4e2 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 13 Sep 2010 21:58:36 -0500 Subject: [PATCH 31/45] Backport missing parts of the regex patch. --- livecd-tools.spec | 7 ++++++- regex.patch | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 regex.patch diff --git a/livecd-tools.spec b/livecd-tools.spec index c191701..4b753e2 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 034 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -16,6 +16,7 @@ URL: http://git.fedorahosted.org/git/livecd # scp livecd*.tar.bz2 fedorahosted.org:livecd Source0: http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2 Patch0: vesa.patch +Patch1: regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs @@ -60,6 +61,7 @@ like live image or appliances. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build make @@ -92,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Mon Sep 13 2010 Bruno Wolff III - 034-4 +- Backport missing parts of the regex fix patch + * Mon Sep 13 2010 Bruno Wolff III - 034-3 - Backported fix for vesa boot menu item diff --git a/regex.patch b/regex.patch new file mode 100644 index 0000000..c40614e --- /dev/null +++ b/regex.patch @@ -0,0 +1,35 @@ +diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh +index 6023509..00f201a 100755 +--- a/tools/livecd-iso-to-disk.sh ++++ b/tools/livecd-iso-to-disk.sh +@@ -70,7 +70,7 @@ getdisk() { + } + + resetMBR() { +- if [[ "$DEV" =~ "/dev/loop*" ]]; then ++ if isdevloop "$DEV"; then + return + fi + getdisk $1 +@@ -129,7 +129,7 @@ checkPartActive() { + if [ "$dev" = "$device" ]; then + return + fi +- if [[ "$dev" =~ "/dev/loop*" ]]; then ++ if isdevloop "$DEV"; then + return + fi + +@@ -189,7 +189,11 @@ createMSDOSLayout() { + partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit b print" |grep ^$device:) + size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/B$//') + /sbin/parted --script $device unit b mkpart primary fat32 17408 $(($size - 17408)) set 1 boot on +- USBDEV=${device}1 ++ if ! isdevloop "$DEV"; then ++ USBDEV=${device}1 ++ else ++ USBDEV=${device} ++ fi + # Sometimes automount can be _really_ annoying. + echo "Waiting for devices to settle..." + /sbin/udevadm settle From d7edf70b650e4dd9fe914d8f51b0f5361de8ebb2 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 13 Sep 2010 22:36:28 -0500 Subject: [PATCH 32/45] Backport a fix for the basic video boot menu item --- livecd-tools.spec | 7 ++++++- menulabel.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 menulabel.patch diff --git a/livecd-tools.spec b/livecd-tools.spec index 4b753e2..e85fe8b 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 034 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -17,6 +17,7 @@ URL: http://git.fedorahosted.org/git/livecd Source0: http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2 Patch0: vesa.patch Patch1: regex.patch +Patch2: menulabel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs @@ -62,6 +63,7 @@ like live image or appliances. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build make @@ -94,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Mon Sep 13 2010 Bruno Wolff III - 034-5 +- Backport basic video menu label fix + * Mon Sep 13 2010 Bruno Wolff III - 034-4 - Backport missing parts of the regex fix patch diff --git a/menulabel.patch b/menulabel.patch new file mode 100644 index 0000000..c921403 --- /dev/null +++ b/menulabel.patch @@ -0,0 +1,13 @@ +diff --git a/imgcreate/live.py b/imgcreate/live.py +index e4e0c2e..9153e10 100644 +--- a/imgcreate/live.py ++++ b/imgcreate/live.py +@@ -519,7 +519,7 @@ menu hiddenrow 5 + fslabel = self.fslabel, + isofstype = "auto", + liveargs = kern_opts, +- long = long, ++ long = long + " (Basic Video)", + short = "linux" + index, + basicvideo = basic, + xdriver = xdriver, From 614903026afb5d7c06796efb8e136cc22067fbf1 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 14 Sep 2010 07:33:52 -0500 Subject: [PATCH 33/45] Backport a patch to catch a missed replacement for /dev/loop/* . --- devloop.patch | 13 +++++++++++++ livecd-tools.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 devloop.patch diff --git a/devloop.patch b/devloop.patch new file mode 100644 index 0000000..ee8b7ff --- /dev/null +++ b/devloop.patch @@ -0,0 +1,13 @@ +diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh +index 00f201a..329ce4f 100755 +--- a/tools/livecd-iso-to-disk.sh ++++ b/tools/livecd-iso-to-disk.sh +@@ -99,7 +99,7 @@ resetMBR() { + } + + checkMBR() { +- if [[ "$DEV" =~ "/dev/loop*" ]]; then ++ if isdevloop "$DEV"; then + return 0 + fi + getdisk $1 diff --git a/livecd-tools.spec b/livecd-tools.spec index e85fe8b..0e3a523 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 034 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -18,6 +18,7 @@ Source0: http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2 Patch0: vesa.patch Patch1: regex.patch Patch2: menulabel.patch +Patch3: devloop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs @@ -64,6 +65,7 @@ like live image or appliances. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make @@ -96,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Mon Sep 14 2010 Bruno Wolff III - 034-6 +- One /dev/loop* change had been missed. Backport patch. + * Mon Sep 13 2010 Bruno Wolff III - 034-5 - Backport basic video menu label fix From dad1508669db706fee09886e4f253ea305e40e4c Mon Sep 17 00:00:00 2001 From: "Tom \"spot\" Callaway" Date: Tue, 14 Sep 2010 16:09:43 -0400 Subject: [PATCH 34/45] fix background image copying to use new-new logo path --- livecd-tools-034-newpath.patch | 12 ++++++++++++ livecd-tools.spec | 9 +++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 livecd-tools-034-newpath.patch diff --git a/livecd-tools-034-newpath.patch b/livecd-tools-034-newpath.patch new file mode 100644 index 0000000..d25c9d6 --- /dev/null +++ b/livecd-tools-034-newpath.patch @@ -0,0 +1,12 @@ +diff -up livecd-tools-034/imgcreate/live.py.newpath livecd-tools-034/imgcreate/live.py +--- livecd-tools-034/imgcreate/live.py.newpath 2010-09-14 16:04:49.205545002 -0400 ++++ livecd-tools-034/imgcreate/live.py 2010-09-14 16:05:22.671544997 -0400 +@@ -372,7 +372,7 @@ class x86LiveImageCreator(LiveImageCreat + + def __copy_syslinux_background(self, isodest): + background_path = self._instroot + \ +- "/usr/share/anaconda/syslinux-vesa-splash.jpg" ++ "/usr/share/anaconda/boot/syslinux-vesa-splash.jpg" + + if not os.path.exists(background_path): + # fallback to F13 location diff --git a/livecd-tools.spec b/livecd-tools.spec index 0e3a523..3bc4d52 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 034 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -19,6 +19,7 @@ Patch0: vesa.patch Patch1: regex.patch Patch2: menulabel.patch Patch3: devloop.patch +Patch4: livecd-tools-034-newpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs @@ -66,6 +67,7 @@ like live image or appliances. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build make @@ -98,7 +100,10 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog -* Mon Sep 14 2010 Bruno Wolff III - 034-6 +* Tue Sep 14 2010 Tom "spot" Callaway - 034-7 +- fix background image copying to use new-new logo path + +* Tue Sep 14 2010 Bruno Wolff III - 034-6 - One /dev/loop* change had been missed. Backport patch. * Mon Sep 13 2010 Bruno Wolff III - 034-5 From 2d3bc61aa6aca8ef110a55cde674e5956edc4e98 Mon Sep 17 00:00:00 2001 From: "Tom \"spot\" Callaway" Date: Tue, 14 Sep 2010 16:10:12 -0400 Subject: [PATCH 35/45] fix background image copying to use new-new logo path --- livecd-tools-034-newpath.patch | 12 ++++++++++++ livecd-tools.spec | 9 +++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 livecd-tools-034-newpath.patch diff --git a/livecd-tools-034-newpath.patch b/livecd-tools-034-newpath.patch new file mode 100644 index 0000000..d25c9d6 --- /dev/null +++ b/livecd-tools-034-newpath.patch @@ -0,0 +1,12 @@ +diff -up livecd-tools-034/imgcreate/live.py.newpath livecd-tools-034/imgcreate/live.py +--- livecd-tools-034/imgcreate/live.py.newpath 2010-09-14 16:04:49.205545002 -0400 ++++ livecd-tools-034/imgcreate/live.py 2010-09-14 16:05:22.671544997 -0400 +@@ -372,7 +372,7 @@ class x86LiveImageCreator(LiveImageCreat + + def __copy_syslinux_background(self, isodest): + background_path = self._instroot + \ +- "/usr/share/anaconda/syslinux-vesa-splash.jpg" ++ "/usr/share/anaconda/boot/syslinux-vesa-splash.jpg" + + if not os.path.exists(background_path): + # fallback to F13 location diff --git a/livecd-tools.spec b/livecd-tools.spec index 0e3a523..3bc4d52 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 034 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -19,6 +19,7 @@ Patch0: vesa.patch Patch1: regex.patch Patch2: menulabel.patch Patch3: devloop.patch +Patch4: livecd-tools-034-newpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs @@ -66,6 +67,7 @@ like live image or appliances. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build make @@ -98,7 +100,10 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog -* Mon Sep 14 2010 Bruno Wolff III - 034-6 +* Tue Sep 14 2010 Tom "spot" Callaway - 034-7 +- fix background image copying to use new-new logo path + +* Tue Sep 14 2010 Bruno Wolff III - 034-6 - One /dev/loop* change had been missed. Backport patch. * Mon Sep 13 2010 Bruno Wolff III - 034-5 From dfd9f857b5aa426389478600e86065216a9647a8 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Thu, 16 Sep 2010 07:51:53 -0500 Subject: [PATCH 36/45] Require syslinux-extlinux extlinux got split into a subpackage, syslinux-extlinux, that is needed by livecd-iso-to-disk. --- livecd-tools.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index 3bc4d52..6d55671 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 034 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -28,6 +28,7 @@ Requires: parted Requires: pyparted %ifarch %{ix86} x86_64 Requires: syslinux +Requires: syslinux-extlinux %endif %ifarch ppc Requires: yaboot @@ -100,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Tue Sep 14 2010 Tom "spot" Callaway - 034-8 +- extlinux is now in a subpackage that is required by livecd-iso-to-disk + * Tue Sep 14 2010 Tom "spot" Callaway - 034-7 - fix background image copying to use new-new logo path From 3146b6f51f222c3ca94d76196ef34703d63eb374 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Thu, 16 Sep 2010 07:55:53 -0500 Subject: [PATCH 37/45] Fix changelog line to blame me today. --- livecd-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index 6d55671..d5eb010 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -101,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog -* Tue Sep 14 2010 Tom "spot" Callaway - 034-8 +* Thu Sep 16 2010 Bruno Wolff III - 034-8 - extlinux is now in a subpackage that is required by livecd-iso-to-disk * Tue Sep 14 2010 Tom "spot" Callaway - 034-7 From 68d77211b01dade9252b01caa4fd4a0df36c6020 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Thu, 16 Sep 2010 23:51:03 -0500 Subject: [PATCH 38/45] Change extlinux requires so that both old and new syslinux will work. --- livecd-tools.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index d5eb010..ce5764c 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 034 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -28,7 +28,7 @@ Requires: parted Requires: pyparted %ifarch %{ix86} x86_64 Requires: syslinux -Requires: syslinux-extlinux +Requires: /sbin/extlinux %endif %ifarch ppc Requires: yaboot @@ -101,6 +101,10 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Thu Sep 16 2010 Bruno Wolff III - 034-9 +- Change requires to /sbin/extlinux since that will work with old and new + versions of syslinux. + * Thu Sep 16 2010 Bruno Wolff III - 034-8 - extlinux is now in a subpackage that is required by livecd-iso-to-disk From cf6a3c0ddf6b38ec7cfbe7d66b2ce5e6c7072a66 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 21 Sep 2010 01:06:27 -0500 Subject: [PATCH 39/45] Document the lzo compressor can be used. --- livecd-tools.spec | 2 ++ lzo.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 lzo.patch diff --git a/livecd-tools.spec b/livecd-tools.spec index ce5764c..b5b8080 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -20,6 +20,7 @@ Patch1: regex.patch Patch2: menulabel.patch Patch3: devloop.patch Patch4: livecd-tools-034-newpath.patch +Patch5: lzo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs @@ -69,6 +70,7 @@ like live image or appliances. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build make diff --git a/lzo.patch b/lzo.patch new file mode 100644 index 0000000..78c2077 --- /dev/null +++ b/lzo.patch @@ -0,0 +1,26 @@ +diff --git a/docs/livecd-creator.pod b/docs/livecd-creator.pod +index e80a119..2c78892 100644 +--- a/docs/livecd-creator.pod ++++ b/docs/livecd-creator.pod +@@ -43,7 +43,7 @@ Defines the file system label. The default is based on the configuration name. + =item --compression-type=COMPRESSOR + + Specify a compressor recognized by mksquashfs. The default is gzip. lzma +-currently requires a custom kernel to produce a functional image. If gzip ++currently requires a custom kernel to produce a functional image. lzo works with 2.6.36+ kernels, but will generally take up more space than using gzip. If gzip + is used, the -comp option is not passed to mksquashfs to allow the use of + older versions of mksquashfs. + +diff --git a/tools/livecd-creator b/tools/livecd-creator +index d1727c5..d352d74 100755 +--- a/tools/livecd-creator ++++ b/tools/livecd-creator +@@ -42,7 +42,7 @@ def parse_options(args): + imgopt.add_option("-f", "--fslabel", type="string", dest="fs_label", + help="File system label (default based on config name)") + imgopt.add_option("", "--compression-type", type="string", dest="compress_type", +- help="Compression type recognized by mksquashfs (default gzip, lzma needs custom kernel)", ++ help="Compression type recognized by mksquashfs (default gzip, lzma needs custom kernel, lzo needs a 2.6.36+ kernel)", + default="gzip") + parser.add_option_group(imgopt) + From 2ee7aca0072e718e9530e683d8ef6e44d0f51cc4 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 21 Sep 2010 01:10:03 -0500 Subject: [PATCH 40/45] Bump release after change. --- livecd-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/livecd-tools.spec b/livecd-tools.spec index b5b8080..2f815a9 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 034 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Tue Sep 21 2010 Bruno Wolff III - 034-10 +- Document the lzo compressor. + * Thu Sep 16 2010 Bruno Wolff III - 034-9 - Change requires to /sbin/extlinux since that will work with old and new versions of syslinux. From 0c58711fcde3bfa980ccd7951c59601358031871 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sun, 26 Sep 2010 23:01:16 -0500 Subject: [PATCH 41/45] Fix relabel of live image when composing on a host wtih selinux disabled. --- livecd-tools.spec | 7 ++++++- selinux.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 selinux.patch diff --git a/livecd-tools.spec b/livecd-tools.spec index 2f815a9..4a92f74 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 034 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -21,6 +21,7 @@ Patch2: menulabel.patch Patch3: devloop.patch Patch4: livecd-tools-034-newpath.patch Patch5: lzo.patch +Patch6: selinux.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs @@ -71,6 +72,7 @@ like live image or appliances. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build make @@ -103,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Sun Sep 26 2010 Bruno Wolff III - 034-11 +- Fix live image relabel when compose host has selinux disabled. + * Tue Sep 21 2010 Bruno Wolff III - 034-10 - Document the lzo compressor. diff --git a/selinux.patch b/selinux.patch new file mode 100644 index 0000000..fbf6ba7 --- /dev/null +++ b/selinux.patch @@ -0,0 +1,13 @@ +diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py +index aa2cff0..9a2145a 100644 +--- a/imgcreate/kickstart.py ++++ b/imgcreate/kickstart.py +@@ -420,7 +420,7 @@ class SelinuxConfig(KickstartConfig): + if not os.path.exists(self.path("/sbin/setfiles")): + return + +- self.call(["/sbin/setfiles", "/etc/selinux/targeted/contexts/files/file_contexts", "-e", "/proc", "-e", "/sys", "-e", "/dev", "-e", "/selinux", "/"]) ++ self.call(["/sbin/setfiles", "-e", "/proc", "-e", "/sys", "-e", "/dev", "-e", "/selinux", "/etc/selinux/targeted/contexts/files/file_contexts", "/"]) + + def apply(self, ksselinux): + if os.path.exists(self.path("/usr/sbin/lokkit")): From b6631d0591a248cc9db1fa4bc13cd5a0995b633b Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 1 Nov 2010 14:45:13 -0700 Subject: [PATCH 42/45] - Converting version number to NVR - Removed patches (now included in v0.3.5) --- .gitignore | 1 + devloop.patch | 13 ------- livecd-tools-034-newpath.patch | 12 ------- livecd-tools.spec | 27 +++++--------- lzo.patch | 26 -------------- menulabel.patch | 13 ------- regex.patch | 35 ------------------ selinux.patch | 13 ------- sources | 2 +- vesa.patch | 66 ---------------------------------- 10 files changed, 11 insertions(+), 197 deletions(-) delete mode 100644 devloop.patch delete mode 100644 livecd-tools-034-newpath.patch delete mode 100644 lzo.patch delete mode 100644 menulabel.patch delete mode 100644 regex.patch delete mode 100644 selinux.patch delete mode 100644 vesa.patch diff --git a/.gitignore b/.gitignore index 0d14529..42dd796 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ livecd-tools-033.tar.bz2 /livecd-tools-034.tar.bz2 +/livecd-tools-0.3.5.tar.bz2 diff --git a/devloop.patch b/devloop.patch deleted file mode 100644 index ee8b7ff..0000000 --- a/devloop.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh -index 00f201a..329ce4f 100755 ---- a/tools/livecd-iso-to-disk.sh -+++ b/tools/livecd-iso-to-disk.sh -@@ -99,7 +99,7 @@ resetMBR() { - } - - checkMBR() { -- if [[ "$DEV" =~ "/dev/loop*" ]]; then -+ if isdevloop "$DEV"; then - return 0 - fi - getdisk $1 diff --git a/livecd-tools-034-newpath.patch b/livecd-tools-034-newpath.patch deleted file mode 100644 index d25c9d6..0000000 --- a/livecd-tools-034-newpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up livecd-tools-034/imgcreate/live.py.newpath livecd-tools-034/imgcreate/live.py ---- livecd-tools-034/imgcreate/live.py.newpath 2010-09-14 16:04:49.205545002 -0400 -+++ livecd-tools-034/imgcreate/live.py 2010-09-14 16:05:22.671544997 -0400 -@@ -372,7 +372,7 @@ class x86LiveImageCreator(LiveImageCreat - - def __copy_syslinux_background(self, isodest): - background_path = self._instroot + \ -- "/usr/share/anaconda/syslinux-vesa-splash.jpg" -+ "/usr/share/anaconda/boot/syslinux-vesa-splash.jpg" - - if not os.path.exists(background_path): - # fallback to F13 location diff --git a/livecd-tools.spec b/livecd-tools.spec index 4a92f74..a2968a6 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -4,8 +4,9 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 034 -Release: 11%{?dist} +Version: 0.3.5 +Release: 1%{?dist} +Epoch: 1 License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -15,15 +16,8 @@ URL: http://git.fedorahosted.org/git/livecd # make dist # scp livecd*.tar.bz2 fedorahosted.org:livecd Source0: http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2 -Patch0: vesa.patch -Patch1: regex.patch -Patch2: menulabel.patch -Patch3: devloop.patch -Patch4: livecd-tools-034-newpath.patch -Patch5: lzo.patch -Patch6: selinux.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: python-imgcreate = %{version}-%{release} +Requires: python-imgcreate = %{epoch}:%{version}-%{release} Requires: mkisofs Requires: isomd5sum Requires: parted @@ -66,13 +60,6 @@ like live image or appliances. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build make @@ -98,13 +85,17 @@ rm -rf $RPM_BUILD_ROOT %files -n python-imgcreate %defattr(-,root,root,-) -%doc API +%doc API COPYING %dir %{python_sitelib}/imgcreate %{python_sitelib}/imgcreate/*.py %{python_sitelib}/imgcreate/*.pyo %{python_sitelib}/imgcreate/*.pyc %changelog +* Mon Nov 01 2010 Brian C. Lane - 0.3.5-1 +- Converting version number to NVR +- Removed patches (now included in v0.3.5) + * Sun Sep 26 2010 Bruno Wolff III - 034-11 - Fix live image relabel when compose host has selinux disabled. diff --git a/lzo.patch b/lzo.patch deleted file mode 100644 index 78c2077..0000000 --- a/lzo.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/docs/livecd-creator.pod b/docs/livecd-creator.pod -index e80a119..2c78892 100644 ---- a/docs/livecd-creator.pod -+++ b/docs/livecd-creator.pod -@@ -43,7 +43,7 @@ Defines the file system label. The default is based on the configuration name. - =item --compression-type=COMPRESSOR - - Specify a compressor recognized by mksquashfs. The default is gzip. lzma --currently requires a custom kernel to produce a functional image. If gzip -+currently requires a custom kernel to produce a functional image. lzo works with 2.6.36+ kernels, but will generally take up more space than using gzip. If gzip - is used, the -comp option is not passed to mksquashfs to allow the use of - older versions of mksquashfs. - -diff --git a/tools/livecd-creator b/tools/livecd-creator -index d1727c5..d352d74 100755 ---- a/tools/livecd-creator -+++ b/tools/livecd-creator -@@ -42,7 +42,7 @@ def parse_options(args): - imgopt.add_option("-f", "--fslabel", type="string", dest="fs_label", - help="File system label (default based on config name)") - imgopt.add_option("", "--compression-type", type="string", dest="compress_type", -- help="Compression type recognized by mksquashfs (default gzip, lzma needs custom kernel)", -+ help="Compression type recognized by mksquashfs (default gzip, lzma needs custom kernel, lzo needs a 2.6.36+ kernel)", - default="gzip") - parser.add_option_group(imgopt) - diff --git a/menulabel.patch b/menulabel.patch deleted file mode 100644 index c921403..0000000 --- a/menulabel.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/imgcreate/live.py b/imgcreate/live.py -index e4e0c2e..9153e10 100644 ---- a/imgcreate/live.py -+++ b/imgcreate/live.py -@@ -519,7 +519,7 @@ menu hiddenrow 5 - fslabel = self.fslabel, - isofstype = "auto", - liveargs = kern_opts, -- long = long, -+ long = long + " (Basic Video)", - short = "linux" + index, - basicvideo = basic, - xdriver = xdriver, diff --git a/regex.patch b/regex.patch deleted file mode 100644 index c40614e..0000000 --- a/regex.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh -index 6023509..00f201a 100755 ---- a/tools/livecd-iso-to-disk.sh -+++ b/tools/livecd-iso-to-disk.sh -@@ -70,7 +70,7 @@ getdisk() { - } - - resetMBR() { -- if [[ "$DEV" =~ "/dev/loop*" ]]; then -+ if isdevloop "$DEV"; then - return - fi - getdisk $1 -@@ -129,7 +129,7 @@ checkPartActive() { - if [ "$dev" = "$device" ]; then - return - fi -- if [[ "$dev" =~ "/dev/loop*" ]]; then -+ if isdevloop "$DEV"; then - return - fi - -@@ -189,7 +189,11 @@ createMSDOSLayout() { - partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit b print" |grep ^$device:) - size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/B$//') - /sbin/parted --script $device unit b mkpart primary fat32 17408 $(($size - 17408)) set 1 boot on -- USBDEV=${device}1 -+ if ! isdevloop "$DEV"; then -+ USBDEV=${device}1 -+ else -+ USBDEV=${device} -+ fi - # Sometimes automount can be _really_ annoying. - echo "Waiting for devices to settle..." - /sbin/udevadm settle diff --git a/selinux.patch b/selinux.patch deleted file mode 100644 index fbf6ba7..0000000 --- a/selinux.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py -index aa2cff0..9a2145a 100644 ---- a/imgcreate/kickstart.py -+++ b/imgcreate/kickstart.py -@@ -420,7 +420,7 @@ class SelinuxConfig(KickstartConfig): - if not os.path.exists(self.path("/sbin/setfiles")): - return - -- self.call(["/sbin/setfiles", "/etc/selinux/targeted/contexts/files/file_contexts", "-e", "/proc", "-e", "/sys", "-e", "/dev", "-e", "/selinux", "/"]) -+ self.call(["/sbin/setfiles", "-e", "/proc", "-e", "/sys", "-e", "/dev", "-e", "/selinux", "/etc/selinux/targeted/contexts/files/file_contexts", "/"]) - - def apply(self, ksselinux): - if os.path.exists(self.path("/usr/sbin/lokkit")): diff --git a/sources b/sources index 89e73c7..434a96a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -601fe671670f7dcb68faebf443c05cba livecd-tools-034.tar.bz2 +b1acf6baf5ed6f25eda2aedef52bfc99 livecd-tools-0.3.5.tar.bz2 diff --git a/vesa.patch b/vesa.patch deleted file mode 100644 index 8afcfd9..0000000 --- a/vesa.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/imgcreate/live.py b/imgcreate/live.py -index 1e0f117..e4e0c2e 100644 ---- a/imgcreate/live.py -+++ b/imgcreate/live.py -@@ -452,24 +452,12 @@ menu hiddenrow 5 - template = """label %(short)s - menu label %(long)s - kernel vmlinuz%(index)s -- append initrd=initrd%(index)s.img root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s -- -- -- label %(short)s -- menu label %(long)s %(basicvideo)s -- kernel vmlinuz%(index)s - append initrd=initrd%(index)s.img root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(xdriver)s %(extra)s - """ - else: - template = """label %(short)s - menu label %(long)s - kernel mboot.c32 -- append xen%(index)s.gz --- vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s --- initrd%(index)s.img -- -- -- label %(short)s -- menu label %(long)s %(basicvideo)s -- kernel mboot.c32 - append xen%(index)s.gz --- vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(xdriver)s %(extra)s --- initrd%(index)s.img - """ - return template % args -@@ -504,7 +492,7 @@ menu hiddenrow 5 - - # Basic video driver - basic = "system with basic video driver" -- xdriver = "xdriver=vesa" -+ xdriver = "xdriver=vesa nomodeset" - - - # tell dracut not to ask for LUKS passwords or activate mdraid sets -@@ -519,14 +507,25 @@ menu hiddenrow 5 - liveargs = kern_opts, - long = long, - short = "linux" + index, -- basicvideo = basic, -- xdriver = xdriver, -+ basicvideo = "", -+ xdriver = "", - extra = "", - index = index) - - if default: - cfg += "menu default\n" - -+ cfg += self.__get_image_stanza(is_xen, isDracut, -+ fslabel = self.fslabel, -+ isofstype = "auto", -+ liveargs = kern_opts, -+ long = long, -+ short = "linux" + index, -+ basicvideo = basic, -+ xdriver = xdriver, -+ extra = "", -+ index = index) -+ - if checkisomd5: - cfg += self.__get_image_stanza(is_xen, isDracut, - fslabel = self.fslabel, From 2db1fc088760bf3c14b2e55faa5aa09463ec982a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 15 Nov 2010 17:05:21 -0800 Subject: [PATCH 43/45] - Change version for f13-branch (bcl) - Misc. fixups (#652522) (fgrose) - Set indentation to 4 spaces (#652522) (fgrose) - Add a release target (bcl) - Pass dracut args during check (#589778) (bcl) - Cleanup EOL spaces (#652522) (fgrose) - Typo. Need space before ]. (bruno) - Add support for timeout and totaltimeout to livecd-iso-to-disk (#531566) (bcl) --- .gitignore | 1 + livecd-tools.spec | 13 ++++++++++++- sources | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 42dd796..4f4005f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ livecd-tools-033.tar.bz2 /livecd-tools-034.tar.bz2 /livecd-tools-0.3.5.tar.bz2 +/livecd-tools-13.0.tar.bz2 diff --git a/livecd-tools.spec b/livecd-tools.spec index a2968a6..5edd21c 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -4,7 +4,7 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 0.3.5 +Version: 13.0 Release: 1%{?dist} Epoch: 1 License: GPLv2 @@ -92,6 +92,17 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Mon Nov 15 2010 Brian C. Lane - 13.0-1 +- Change version for f13-branch (bcl) +- Misc. fixups (#652522) (fgrose) +- Set indentation to 4 spaces (#652522) (fgrose) +- Add a release target (bcl) +- Pass dracut args during check (#589778) (bcl) +- Cleanup EOL spaces (#652522) (fgrose) +- Typo. Need space before ]. (bruno) +- Add support for timeout and totaltimeout to livecd-iso-to-disk (#531566) + (bcl) + * Mon Nov 01 2010 Brian C. Lane - 0.3.5-1 - Converting version number to NVR - Removed patches (now included in v0.3.5) diff --git a/sources b/sources index 434a96a..438e395 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1acf6baf5ed6f25eda2aedef52bfc99 livecd-tools-0.3.5.tar.bz2 +8ba36b10bd9946f35f792d494eb570dd livecd-tools-13.0.tar.bz2 From 352f2deae23de54f788a7ef71e2c0c05a66dd3bc Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 22 Dec 2010 15:42:16 -0800 Subject: [PATCH 44/45] - Version 13.1 (bcl) - Trap copyFile errors (#663849) (fgrose) - Create tmpdir if it doesn't exist (#658632) (bcl) - Fix partition number selection for MMC bus devices (#587411) (fgrose) - Tolerate empty transactions (lkundrak) --- .gitignore | 1 + livecd-tools.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4f4005f..13505d5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ livecd-tools-033.tar.bz2 /livecd-tools-034.tar.bz2 /livecd-tools-0.3.5.tar.bz2 /livecd-tools-13.0.tar.bz2 +/livecd-tools-13.1.tar.bz2 diff --git a/livecd-tools.spec b/livecd-tools.spec index 5edd21c..e2435d8 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -4,7 +4,7 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 13.0 +Version: 13.1 Release: 1%{?dist} Epoch: 1 License: GPLv2 @@ -92,6 +92,13 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Wed Dec 22 2010 Brian C. Lane - 13.1-1 +- Version 13.1 (bcl) +- Trap copyFile errors (#663849) (fgrose) +- Create tmpdir if it doesn't exist (#658632) (bcl) +- Fix partition number selection for MMC bus devices (#587411) (fgrose) +- Tolerate empty transactions (lkundrak) + * Mon Nov 15 2010 Brian C. Lane - 13.0-1 - Change version for f13-branch (bcl) - Misc. fixups (#652522) (fgrose) diff --git a/sources b/sources index 438e395..50ea6bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ba36b10bd9946f35f792d494eb570dd livecd-tools-13.0.tar.bz2 +2326154b505206e2127bce36457b7253 livecd-tools-13.1.tar.bz2 From 9898eb0290e8393157f5dca0eb20cf2e2cf363d1 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 23 Feb 2011 16:36:24 -0800 Subject: [PATCH 45/45] - Version 13.2 (bcl) - Print reason for sudden exit (bcl) - Fix skipcopy usage with DVD iso (#644194) (bmj001) - Move selinux relabel to after %post (#648591) (bcl) - Add support for virtio disks to livecd (#672936) (bcl) - Check return value on udevadm (#637258) (bcl) - Source may be a file or a block device, mount accordingly (bcl) - Align start of partition at 1MiB (#668967) (bcl) - Check for one big initrd.img (#671900) (bcl) - Update documentation for xz availability. (bruno) - Change releasever to a command line option (#667474) (bcl) - Assign a device-mapper UUID w/ subsystem prefix to the dm snapshot. (dlehman) - Fix git URLs to match reality. (dlehman) --- .gitignore | 1 + livecd-tools.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 13505d5..eea4da2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ livecd-tools-033.tar.bz2 /livecd-tools-0.3.5.tar.bz2 /livecd-tools-13.0.tar.bz2 /livecd-tools-13.1.tar.bz2 +/livecd-tools-13.2.tar.bz2 diff --git a/livecd-tools.spec b/livecd-tools.spec index e2435d8..70ce0ea 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -4,7 +4,7 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 13.1 +Version: 13.2 Release: 1%{?dist} Epoch: 1 License: GPLv2 @@ -92,6 +92,21 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Wed Feb 23 2011 Brian C. Lane - 13.2-1 +- Version 13.2 (bcl) +- Print reason for sudden exit (bcl) +- Fix skipcopy usage with DVD iso (#644194) (bmj001) +- Move selinux relabel to after %post (#648591) (bcl) +- Add support for virtio disks to livecd (#672936) (bcl) +- Check return value on udevadm (#637258) (bcl) +- Source may be a file or a block device, mount accordingly (bcl) +- Align start of partition at 1MiB (#668967) (bcl) +- Check for one big initrd.img (#671900) (bcl) +- Update documentation for xz availability. (bruno) +- Change releasever to a command line option (#667474) (bcl) +- Assign a device-mapper UUID w/ subsystem prefix to the dm snapshot. (dlehman) +- Fix git URLs to match reality. (dlehman) + * Wed Dec 22 2010 Brian C. Lane - 13.1-1 - Version 13.1 (bcl) - Trap copyFile errors (#663849) (fgrose) diff --git a/sources b/sources index 50ea6bd..f81ef59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2326154b505206e2127bce36457b7253 livecd-tools-13.1.tar.bz2 +3b7f52714b17f8926820b52f8839a40a livecd-tools-13.2.tar.bz2