- add selinux to text kickstart docs (#175868)

2 files changed, 25 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 2752233a0..46f6c5b50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,8 +4,9 @@
 	hard drive list (#147504)
 	* kickstart.py (KickstartBase.defineLogicalVolume): Check for missing
 	vg declaration earlier so the error message makes sense (#176989).
-        * network.py (NetworkDevice.__str__): quote ethtool opts properly
-        (#176918)
+	* network.py (NetworkDevice.__str__): quote ethtool opts properly
+	(#176918)
+	* docs/kickstart-docs.txt: add selinux (#175868)
 
 2006-02-17  Peter Jones  <pjones@redhat.com>
 
diff --git a/docs/kickstart-docs.txt b/docs/kickstart-docs.txt
index cb001a74c..609e9b729 100644
--- a/docs/kickstart-docs.txt
+++ b/docs/kickstart-docs.txt
@@ -1033,6 +1033,28 @@ Creating the Kickstart File
                         If this is present, the password argument is assumed
                         to already be encrypted.
 
+    selinux (optional)
+
+        Sets the system's SELinux mode to one of the following arguments:
+
+        selinux [--enforcing|--permissive|--disabled]
+
+            --enforcing
+
+                Enables SELinux with the default targeted policy being
+                enforced.  If the selinux option is not present in the
+                kickstart file, SELinux is enabled and set to --enforcing
+                by default. 
+
+            --permissive
+
+                Outputs warnings only based on the SELinux policy, but does
+                not actually enforce the policy.
+
+            --disabled
+
+                Disables SELinux completely on the system.
+
    skipx (optional)
 
            If present, X is not configured on the installed system.