[Fedora-livecd-list] Branch 'rhel6-branch' - imgcreate/kickstart.py

[Brian C. Lane]

 imgcreate/kickstart.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9c1868bf39af0d23d58e3aa184345de810443310
Author: Brian C. Lane <bcl at redhat.com>
Date:   Fri May 2 15:54:42 2014 -0700

    fix firewalls being reset when setting selinux state from imgcreate
    
    Move the patch for this from pkg-git into upstream.

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