[Fedora-livecd-list] Branch 'f16-branch' - 2 commits - imgcreate/kickstart.py Makefile

[Brian C. Lane]

 Makefile               |    2 +-
 imgcreate/kickstart.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a634ae0427764b37a1d0ae8ad0dab89d6a569e7e
Author: Brian C. Lane <bcl at redhat.com>
Date:   Wed Dec 21 17:23:53 2011 -0800

    Version 16.10

diff --git a/Makefile b/Makefile
index e35cacf..68804c8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-VERSION = 16.9
+VERSION = 16.10
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}


commit 48e24d462517b6dcc01e4f5f47ff1ab17000baa1
Author: Brian C. Lane <bcl at redhat.com>
Date:   Wed Dec 21 14:47:40 2011 -0800

    python-imgcreate: remove -f from second lokkit call (#769457)
    
    lokkit gets called twice. -f is fine for the first call, but on the
    second it wipes out any firewall settings. Remove it from the
    SelinuxConfig class.

diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 345c638..09f5ed3 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -425,7 +425,7 @@ class SelinuxConfig(KickstartConfig):
 
     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")