Makefile | 2 +-
imgcreate/kickstart.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b3bcec8900e94580c51906af94c383bb4166a18a
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Wed Dec 21 14:50:21 2011 -0800
Version 17.3
diff --git a/Makefile b/Makefile
index ca9c004..b03b2c8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 17.2
+VERSION = 17.3
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
commit d00a4d83188fbc911bd55954a2011c91b650128f
Author: Brian C. Lane <bcl(a)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")