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

[Brian C. Lane]

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

New commits:
commit 2ab753ad5268df2e5f7033852ae922b55df0aa96
Author: Brian C. Lane <bcl at redhat.com>
Date:   Wed Jan 23 15:50:45 2013 -0800

    correctly check for selinux state (#896610)
    
    The check for selinux_enabled was incorrect. selinux is enabled
    when in enforcing or permissive mode.

diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index cb9829c..5195e6a 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -570,4 +570,5 @@ def get_post_scripts(ks):
     return scripts
 
 def selinux_enabled(ks):
-    return ks.handler.selinux.selinux == ksconstants.SELINUX_ENFORCING
+    return ks.handler.selinux.selinux in (ksconstants.SELINUX_ENFORCING,
+                                          ksconstants.SELINUX_PERMISSIVE)