imgcreate/creator.py | 3 +--
imgcreate/kickstart.py | 9 ++++++---
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit d8c25944dde2de95a38c08fbb8e890295290ab21
Author: Alan Pevec <apevec(a)redhat.com>
Date: Tue Jul 22 05:20:10 2008 +0200
fix SelinuxConfig firewall side-effect
firewall --disabled is ignored:
SelinuxConfig is running lokkit with SEL options only
and --enabled (for firewall) is the default
patch for livecd-tools-017.1-1.fc9 i.e. f9-branch in livecd git
Signed-off-by: Alan Pevec <apevec(a)redhat.com>
diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index c9ed60c..e61f034 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -703,13 +703,12 @@ class ImageCreator(object):
kickstart.KeyboardConfig(self._instroot).apply(ksh.keyboard)
kickstart.TimezoneConfig(self._instroot).apply(ksh.timezone)
kickstart.AuthConfig(self._instroot).apply(ksh.authconfig)
- kickstart.FirewallConfig(self._instroot).apply(ksh.firewall)
kickstart.SelinuxConfig(self._instroot).apply(ksh.selinux)
+ kickstart.FirewallConfig(self._instroot).apply(ksh.firewall)
kickstart.RootPasswordConfig(self._instroot).apply(ksh.rootpw)
kickstart.ServicesConfig(self._instroot).apply(ksh.services)
kickstart.XConfig(self._instroot).apply(ksh.xconfig)
kickstart.NetworkConfig(self._instroot).apply(ksh.network)
- kickstart.SelinuxConfig(self._instroot).apply(ksh.selinux)
self._create_bootconfig()
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 0f797b8..451b133 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -171,12 +171,15 @@ class FirewallConfig(KickstartConfig):
#
# FIXME: should handle the rest of the options
#
- if not ksfirewall.enabled:
- return
if not os.path.exists(self.path("/usr/sbin/lokkit")):
return
+ if ksfirewall.enabled:
+ status = "--enabled"
+ else:
+ status = "--disabled"
+
self.call(["/usr/sbin/lokkit",
- "-f", "--quiet", "--nostart",
"--enabled"])
+ "-f", "--quiet", "--nostart", status])
class RootPasswordConfig(KickstartConfig):
"""A class to apply a kickstart root password configuration to a
system."""
Show replies by date