View | Details | Raw Unified
Collapse All | Expand All

(-) catalyst.orig/modules/generic_stage_target.py (-6 lines)
 Lines 345-356   class generic_stage_target(generic_targe Link Here  
	def set_fsops(self):
	def set_fsops(self):
		if self.settings.has_key("fstype"):
		if self.settings.has_key("fstype"):
			self.valid_values.append("fsops")
			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"):
			if self.settings.has_key(self.settings["spec_prefix"]+"/fsops"):
				self.settings["fsops"]=self.settings[self.settings["spec_prefix"]+"/fsops"]
				self.settings["fsops"]=self.settings[self.settings["spec_prefix"]+"/fsops"]
				del self.settings[self.settings["spec_prefix"]+"/fsops"]
				del self.settings[self.settings["spec_prefix"]+"/fsops"]
(-) catalyst.orig/modules/livecd_stage2_target.py (-2 / +2 lines)
 Lines 24-31   class livecd_stage2_target(generic_stage Link Here  
			"livecd/rcadd","livecd/rcdel","livecd/fsscript","livecd/xinitrc",\
			"livecd/rcadd","livecd/rcdel","livecd/fsscript","livecd/xinitrc",\
			"livecd/root_overlay","livecd/devmanager","livecd/users",\
			"livecd/root_overlay","livecd/devmanager","livecd/users",\
			"gamecd/conf","livecd/users","portage_overlay","livecd/cdfstype",\
			"gamecd/conf","livecd/users","portage_overlay","livecd/cdfstype",\
			"livecd/fstype","livecd/linuxrc","livecd/bootargs","gamecd/conf",\
 
			"livecd/fstype","livecd/fsops","livecd/linuxrc","livecd/bootargs",\
 
			"livecd/xdm","livecd/xsession","livecd/volid"])
 
			"gamecd/conf","livecd/xdm","livecd/xsession","livecd/volid"])
 
		
		
		generic_stage_target.__init__(self,spec,addlargs)
		generic_stage_target.__init__(self,spec,addlargs)
		if not self.settings.has_key("livecd/type"):
		if not self.settings.has_key("livecd/type"):
(-) catalyst.orig/targets/support/filesystem-functions.sh (-4 / +4 lines)
 Lines 53-59   create_noloop() { Link Here  
create_squashfs() {
create_squashfs() {
	echo "Creating squashfs..."
	echo "Creating squashfs..."
	export loopname="image.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?"
		|| die "mksquashfs failed, did you emerge squashfs-tools?"
}
}

  

    

    

       Lines 61-67
      create_jffs() { 
    
  Link Here 
    

  

        
	echo "Creating jffs..."
	echo "Creating jffs..."

        
	export loopname="image.jffs"
	export loopname="image.jffs"

        
	# fs_check /usr/sbin/mkfs.jffs jffs sys-fs/mtd
	# 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"
		|| die "Could not create a jffs filesystem"

        
}
}

        

  

    

    

       Lines 69-75
      create_jffs2(){ 
    
  Link Here 
    

  

        
	echo "Creating jffs2..."
	echo "Creating jffs2..."

        
	export loopname="image.jffs"
	export loopname="image.jffs"

        
	# fs_check /usr/sbin/mkfs.jffs2 jffs2 sys-fs/mtd
	# 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"
		|| die "Could not create a jffs2 filesystem"

        
}
}

        

  

    

    

       Lines 77-82
      create_cramfs(){ 
    
  Link Here 
    

  

        
	echo "Creating cramfs..."
	echo "Creating cramfs..."

        
	export loopname="image.cramfs"
	export loopname="image.cramfs"

        
	#fs_check /sbin/mkcramfs cramfs sys-fs/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"
		|| die "Could not create a cramfs filesystem"

        
}
}