--- lspp-eal4-config-ibm-0.18/kickstart/src/common-post.cfg	2007-01-23 08:11:05.000000000 -0500
+++ eal4-config-0.16/kickstart/src/common-post.cfg	2007-02-01 17:08:20.389726192 -0500
@@ -118,12 +118,23 @@ STTY_SAVE=$(stty -g)
 stty sane
 reset || clear
 
-echo "*** Common Criteria LSPP configuration kickstart ***"
+echo "*** Common Criteria EAL4 configuration kickstart ***"
 echo
 
+while true 
+do
+	PROFILE="$(ask "Protection profile (capp or lspp)" "capp")"
+	if [ "$PROFILE" == "lspp" ] || [ "$PROFILE" == "capp" ] 
+	then
+		break
+	else
+		confirm "Profile must be "capp" or "lspp" - try again?" "y" || die "Installation aborted."
+	fi
+done
+		
 /etc/init.d/network start
 
-RPMTMP=/root/lspp-rpms
+RPMTMP=/root/eal4-rpms
 mkdir -p $RPMTMP
 cd $RPMTMP
 
@@ -140,27 +151,35 @@ do
 	fi
 done
 
-echo "Switching SELinux to MLS mode..."
-lokkit -q -n --selinuxtype=mls
-setenforce 0
-load_policy -b 2>&1 | grep -v no.longer.in.policy
-
-echo "Fixing file labels..."
-# FIXME: fixfiles ignores allegedly R/O filesystems due to bad /etc/mtab ?
-cat /proc/mounts > /etc/mtab
-fixfiles -f restore
-
-# FIXME: should not need /.autorelabel after fixfiles
-#echo "Will relabel file system on next boot."
-#echo "If booting fails, add 'enforcing=0' to the kernel command line."
-#touch /.autorelabel
+if [ "$PROFILE" == "lspp" ] 
+then
+	echo "Switching SELinux to MLS mode..."
+	lokkit -q -n --selinuxtype=mls
+	setenforce 0
+	load_policy -b 2>&1 | grep -v no.longer.in.policy
+
+	echo "Fixing file labels..."
+	# FIXME: fixfiles ignores allegedly R/O filesystems due to bad /etc/mtab ?
+	cat /proc/mounts > /etc/mtab
+	fixfiles -f restore
+
+#	echo "Will relabel file system on next boot."
+#	echo "If booting fails, add 'enforcing=0' to the kernel command line."
+#	touch /.autorelabel
+else
+	echo "Using default SELinux configuration."
+fi
 
 echo
 echo "Please enter the password for the root account."
 while ! passwd root; do :; done
 
-## FIXME: mcstransd doesn't work (hangs when requesting translation?)
-#/etc/init.d/mcstrans start
+if [ "$PROFILE" == "lspp" ] 
+then
+	## FIXME: mcstransd doesn't work (hangs when requesting translation?)
+	#/etc/init.d/mcstrans start
+	echo "FIXME: what's up with mcstrans?"
+fi
 
 while true
 do
@@ -174,9 +193,12 @@ do
 	then
 		while ! passwd "$Uid"; do :; done
 		chage -m 1 -M 60 -W 7 "$Uid"
-		## FIXME: label translation isn't working in postinstall
-		#semanage login -a -s staff_u -r SystemLow-SystemHigh "$Uid"
-		semanage login -a -s staff_u -r s0-s15:c0.c1023 "$Uid"
+		if [ "$PROFILE" == "lspp" ] 
+		then
+			## FIXME: label translation isn't working in postinstall
+			#semanage login -a -s staff_u -r SystemLow-SystemHigh "$Uid"
+			semanage login -a -s staff_u -r s0-s15:c0.c1023 "$Uid"
+		fi
 	else
 		echo "Warning: adding user unsuccessful, please try again."
 	fi
@@ -184,7 +206,7 @@ do
 	confirm "Add more administrative users" "n" || break
 done
 
-lspp-eal4-config -a
+eal4-config -a --"$PROFILE"
 
 # restore file descriptors and TTY
 stty $STTY_SAVE
