kadischi/post_install_scripts 04auth.sh, 1.2, 1.3 05fsclean.py, 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-serv9717/kadischi/post_install_scripts

Modified Files:
	04auth.sh 05fsclean.py 
Log Message:
Contributor: Toshio Kuratomi(SquashFS functionality as optional ), other minor fixes of unneccessary dependants on installed files.


Index: 04auth.sh
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04auth.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 04auth.sh	20 Mar 2006 05:59:05 -0000	1.2
+++ 04auth.sh	30 Mar 2006 04:29:22 -0000	1.3
@@ -2,11 +2,15 @@
 
 chroot $1 /usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth
 
+# We could eventually make this more useful, and maybe in another way.
+# With selinux=0 we shouldn't be having SELinux problems.
+# Likewise a firewall will exist unless we've used kickstart to disable it.
+
 # 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
+#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


Index: 05fsclean.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/05fsclean.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- 05fsclean.py	21 Aug 2005 17:09:01 -0000	1.1.1.1
+++ 05fsclean.py	30 Mar 2006 04:29:22 -0000	1.2
@@ -2,6 +2,7 @@
 
 import os
 import sys
+import shutil
 from functions import *
 
 # Directories that we want to empty but not delete
@@ -60,4 +61,4 @@
 	directories_to_be_emptied,
 	directories_to_be_cleaned,
 	files_to_be_removed)
-clean_up_root (rootdir)
\ No newline at end of file
+clean_up_root (rootdir)