- 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)

.gitignore

@@ -3,3 +3,4 @@
 /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.spec

@@ -4,7 +4,7 @@
 
 Summary: Tools for building live CDs
 Name: livecd-tools
-Version: 13.4.5
+Version: 13.4.6
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2
@@ -96,6 +96,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* 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)

lokkit-fw-no-reset.patch

@@ -1,12 +1,27 @@
-index 345c638..09f5ed3 100644
+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
-@@ -425,7 +425,7 @@ class SelinuxConfig(KickstartConfig):
+@@ -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")
  
-     def apply(self, ksselinux):
-         if os.path.exists(self.path("/usr/sbin/lokkit")):
--            args = ["/usr/sbin/lokkit", "-f", "--quiet", "--nostart"]
-+            args = ["/usr/sbin/lokkit", "--quiet", "--nostart"]
- 
-             if ksselinux.selinux == ksconstants.SELINUX_ENFORCING:
-                 args.append("--selinux=enforcing")
+-- 
+1.9.0
+

sources

@@ -1 +1 @@
-9981a8efbc0ab4f86cbdc9801657581e  livecd-tools-13.4.5.tar.bz2
+c7c0b2b288f1152931ad25e95995a4de  livecd-tools-13.4.6.tar.bz2