- Version 13.4.9 (bcl)

- Revert "symlink /etc/mtab to /proc/self/mounts (#688277)" (esoule)
  Resolves: rhbz#1347953

.gitignore

@@ -1,3 +1,10 @@
-livecd-tools-033.tar.bz2
-/livecd-tools-034.tar.bz2
-/livecd-tools-0.3.5.tar.bz2
+/livecd-tools-13.2.tar.bz2
+/livecd-tools-13.3.tar.bz2
+/livecd-tools-13.4.tar.bz2
+/livecd-tools-13.4.4.tar.bz2
+/livecd-tools-13.4.5.tar.bz2
+/livecd-tools-13.4.6.tar.bz2
+/livecd-tools-13.4.7.tar.bz2
+/livecd-tools-13.4.8.tar.bz2
+/livecd-tools-13.4.9.tar.bz2
+/livecd-tools-13.4.10.tar.bz2

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

livecd-tools.spec

@@ -4,7 +4,7 @@
 
 Summary: Tools for building live CDs
 Name: livecd-tools
-Version: 0.3.5
+Version: 13.4.10
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2
@@ -22,9 +22,10 @@ Requires: mkisofs
 Requires: isomd5sum
 Requires: parted
 Requires: pyparted
+Requires: util-linux
 %ifarch %{ix86} x86_64
 Requires: syslinux
-Requires: /sbin/extlinux
+Requires: syslinux-extlinux
 %endif
 %ifarch ppc
 Requires: yaboot
@@ -82,6 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/image-creator
 %{_bindir}/liveimage-mount
 %{_bindir}/mkbiarch
+%{_bindir}/mkefiboot
 
 %files -n python-imgcreate
 %defattr(-,root,root,-)
@@ -92,6 +94,90 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Tue Jun 21 2016 Brian C. Lane <bcl@redhat.com> - 13.4.10-1
+- Version 13.4.9 (bcl)
+- Revert "symlink /etc/mtab to /proc/self/mounts (#688277)" (esoule)
+  Resolves: rhbz#1347953
+
+* Tue Nov 10 2015 Brian C. Lane <bcl@redhat.com> 13.4.9-1
+- Version 13.4.9 (bcl)
+- python-imgcreate: remove -f from second lokkit call (#769457) (bcl)
+
+* Mon Jun 08 2015 Brian C. Lane <bcl@redhat.com> 13.4.8-1
+- Version 13.4.8 (bcl)
+- litd: Make sure device nodes have time to appear (bcl)
+- symlink /etc/mtab to /proc/self/mounts (#688277) (bcl)
+
+* Fri Feb 27 2015 Brian C. Lane <bcl@redhat.com> 13.4.7-1
+- Version 13.4.7 (bcl)
+- lokkit patch moved upstream
+
+* Fri May 02 2014 Brian C. Lane <bcl@redhat.com> 13.4.6-1
+- Version 13.4.6 (bcl)
+- edit-livecd: Remove rebuild_iso_symlinks (#928620) (bcl)
+- correctly check for selinux state (#896610) (bcl)
+- Change vfat limit from 2047 to 4095 (bcl)
+
+* Fri Jan 31 2014 Brian C. Lane <bcl@redhat.com> 13.4.5-1
+- Version 13.4.5 (bcl)
+- Add dmsquash-live module to dracut (#957892) (bcl)
+
+* Thu May 23 2013 Brian C. Lane <bcl@redhat.com> 13.4.4-2
+- Version 13.4.4 (bcl)
+- Avoid setting empty root password (#962493) (thoger)
+- Update spec for mkefiboot
+
+* Tue Aug 28 2012 Seth Vidal <skvidal at fedoraproject.org>
+- fix firewalls being reset when setting selinux state from imgcreate
+
+* Tue Aug 23 2011 Brian C. Lane <bcl@redhat.com> - 13.4-1
+- Version 13.4 (bcl)
+- Use copyFile on the iso (bcl)
+- Add EFI support to netboot and DVD iso (bcl)
+- Use rsync to copy if available (bcl)
+- Support /EFI/BOOT or /EFI/boot (#688258) (bcl)
+- gptmbr can be written directly to the mbr (bcl)
+- Ensure previous filesystems are wiped when formatting (#712553) (bcl)
+- Turn on the legacy_boot flag for EFI (#680563) (bcl)
+- Copy updates and product image files (bcl)
+
+* Wed Jun 01 2011 Brian C. Lane <bcl@redhat.com> - 13.3-1
+- Version 13.3 (bcl)
+- extlinux doesn't support ext4 or btrfs on F13 (#709778) (bcl)
+
+* Wed Feb 23 2011 Brian C. Lane <bcl@redhat.com> - 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 <bcl@redhat.com> - 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 <bcl@redhat.com> - 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 <bcl@redhat.com> - 0.3.5-1
 - Converting version number to NVR
 - Removed patches (now included in v0.3.5)

lokkit-fw-no-reset.patch

@@ -0,0 +1,27 @@
+From 9c1868bf39af0d23d58e3aa184345de810443310 Mon Sep 17 00:00:00 2001
+From: "Brian C. Lane" <bcl@redhat.com>
+Date: Fri, 2 May 2014 15:54:42 -0700
+Subject: [PATCH] fix firewalls being reset when setting selinux state from
+ imgcreate
+
+Move the patch for this from pkg-git into upstream.
+---
+ imgcreate/kickstart.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
+index 04191b8..f50a9b8 100644
+--- a/imgcreate/kickstart.py
++++ b/imgcreate/kickstart.py
+@@ -175,7 +175,7 @@ class FirewallConfig(KickstartConfig):
+     def apply(self, ksfirewall):
+         if not os.path.exists(self.path("/usr/sbin/lokkit")):
+             return
+-        args = ["/usr/sbin/lokkit", "-f", "--quiet", "--nostart"]
++        args = ["/usr/sbin/lokkit", "--quiet", "--nostart"]
+         if ksfirewall.enabled:
+             args.append("--enabled")
+ 
+-- 
+1.9.0
+

sources

@@ -1 +1 @@
-b1acf6baf5ed6f25eda2aedef52bfc99  livecd-tools-0.3.5.tar.bz2
+69a5457840ed2aad950c92815fc9a832  livecd-tools-13.4.10.tar.bz2