kadischi/post_install_scripts 04auth.sh,1.1.1.1,1.2

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9660/kadischi/post_install_scripts

Modified Files:
	04auth.sh 
Log Message:
Various minor cleanups


Index: 04auth.sh
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04auth.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- 04auth.sh	21 Aug 2005 17:09:01 -0000	1.1.1.1
+++ 04auth.sh	20 Mar 2006 05:59:05 -0000	1.2
@@ -2,6 +2,11 @@
 
 chroot $1 /usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth
 
-chroot $1 /usr/sbin/lokkit --quiet --nostart -f --disabled
-
+# Don't disable a user's set firewall rules explicitly
+fw_is_enabled=$(grep ^--enabled $1/etc/sysconfig/system-config-securitylevel)
+if [ -n $fw_is_enabled ]; then
+   echo "Found an enabled firewall.."
+else
+   chroot $1 /usr/sbin/lokkit --quiet --nostart -f --disabled
+fi
 chroot $1 /usr/sbin/lokkit --quiet --nostart --selinux=disabled