diff -Naurp catalyst.orig/modules/generic_stage_target.py catalyst/modules/generic_stage_target.py
--- catalyst.orig/modules/generic_stage_target.py	2006-06-26 02:44:56 -0400
+++ catalyst/modules/generic_stage_target.py	2006-06-28 01:55:42 -0400
@@ -345,12 +345,6 @@ class generic_stage_target(generic_targe
 	def set_fsops(self):
 		if self.settings.has_key("fstype"):
 			self.valid_values.append("fsops")
-			if self.settings.has_key(self.settings["spec_prefix"]+"/fs-ops"):
-				print "\n\n\nWarning!!!"+self.settings["spec_prefix"]+"/fs-ops" + "is deprecated and may be removed."
-				print "\tUse "+self.settings["spec_prefix"]+"/fsops" + "instead.\n\n\n"
-				self.settings["fsops"]=self.settings[self.settings["spec_prefix"]+"/fs-ops"]
-				del self.settings[self.settings["spec_prefix"]+"/fs-ops"]
-			
 			if self.settings.has_key(self.settings["spec_prefix"]+"/fsops"):
 				self.settings["fsops"]=self.settings[self.settings["spec_prefix"]+"/fsops"]
 				del self.settings[self.settings["spec_prefix"]+"/fsops"]
diff -Naurp catalyst.orig/modules/livecd_stage2_target.py catalyst/modules/livecd_stage2_target.py
--- catalyst.orig/modules/livecd_stage2_target.py	2006-01-18 08:06:40 -0500
+++ catalyst/modules/livecd_stage2_target.py	2006-06-28 01:54:03 -0400
@@ -24,8 +24,8 @@ class livecd_stage2_target(generic_stage
 			"livecd/rcadd","livecd/rcdel","livecd/fsscript","livecd/xinitrc",\
 			"livecd/root_overlay","livecd/devmanager","livecd/users",\
 			"gamecd/conf","livecd/users","portage_overlay","livecd/cdfstype",\
-			"livecd/fstype","livecd/linuxrc","livecd/bootargs","gamecd/conf",\
-			"livecd/xdm","livecd/xsession","livecd/volid"])
+			"livecd/fstype","livecd/fsops","livecd/linuxrc","livecd/bootargs",\
+			"gamecd/conf","livecd/xdm","livecd/xsession","livecd/volid"])
 		
 		generic_stage_target.__init__(self,spec,addlargs)
 		if not self.settings.has_key("livecd/type"):
diff -Naurp catalyst.orig/targets/support/filesystem-functions.sh catalyst/targets/support/filesystem-functions.sh
--- catalyst.orig/targets/support/filesystem-functions.sh	2005-12-16 13:57:57 -0500
+++ catalyst/targets/support/filesystem-functions.sh	2006-06-28 02:04:43 -0400
@@ -53,7 +53,7 @@ create_noloop() {
 create_squashfs() {
 	echo "Creating squashfs..."
 	export loopname="image.squashfs"
-	mksquashfs "${clst_destpath}" "$1/${loopname}" ${clst_fs_ops} -noappend \
+	mksquashfs "${clst_destpath}" "$1/${loopname}" ${clst_fsops} -noappend \
 		|| die "mksquashfs failed, did you emerge squashfs-tools?"
 }
 
@@ -61,7 +61,7 @@ create_jffs() {
 	echo "Creating jffs..."
 	export loopname="image.jffs"
 	# fs_check /usr/sbin/mkfs.jffs jffs sys-fs/mtd
-	mkfs.jffs -d ${clst_destpath} -o $1/${loopname} ${clst_fs_ops} \
+	mkfs.jffs -d ${clst_destpath} -o $1/${loopname} ${clst_fsops} \
 		|| die "Could not create a jffs filesystem"
 }
 
@@ -69,7 +69,7 @@ create_jffs2(){
 	echo "Creating jffs2..."
 	export loopname="image.jffs"
 	# fs_check /usr/sbin/mkfs.jffs2 jffs2 sys-fs/mtd
-	mkfs.jffs2 --root=${clst_destpath} --output=$1/${loopname} ${clst_fs_ops} \
+	mkfs.jffs2 --root=${clst_destpath} --output=$1/${loopname} ${clst_fsops} \
 		|| die "Could not create a jffs2 filesystem"
 }
 
@@ -77,6 +77,6 @@ create_cramfs(){
 	echo "Creating cramfs..."
 	export loopname="image.cramfs"
 	#fs_check /sbin/mkcramfs cramfs sys-fs/cramfs
-	mkcramfs ${clst_fs_ops} ${clst_destpath} $1/${loopname} \
+	mkcramfs ${clst_fsops} ${clst_destpath} $1/${loopname} \
 		|| die "Could not create a cramfs filesystem"
 }