X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcdrom;h=d5df330c41bd344072b4855833e0f49440aa2c00;hb=a8e4c65724fb2796fe81242180664da32625d478;hp=45de6f7a7414ae0a4b94ce69ec5c792e726648bd;hpb=d7bf4fe7c4ca3e8146e3ebe2f74d4405042bc1a0;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/cdrom b/lfs/cdrom
index 45de6f7a74..d5df330c41 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -48,7 +48,8 @@ md5 :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	rm -rf /install/cdrom /tmp/*
 
-	cp -f $(DIR_SRC)/config/rootfiles/cdrom_corever /opt/pakfire/db/core/mine
+	#Clear mtab (prevents .journal problems)
+	echo > /etc/mtab
 
 	# Compress root filesystem
 	# Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
@@ -65,7 +66,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	tar -x -C /tmp -f /$(SNAME).tar
 	rm -f /$(SNAME).tar
 	@mkdir /tmp/sys
-	cd /tmp && tar jcf /install/cdrom/$(SNAME)-$(VERSION).tbz2 * && rm -rf *
+	cd /tmp && tar  cf /install/cdrom/$(SNAME)-$(VERSION).tlz --lzma * && rm -rf *
 
 	# Other files
 	sed 's/VERSION/$(VERSION)/' $(DIR_SRC)/config/cdrom/README.txt > /install/cdrom/README.txt
@@ -91,4 +92,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 						xargs md5sum > md5sum.txt; \
 	cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
     	    -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
-    	    -c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-$(ED).iso
+    	    -c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-$(ED)-core$(CORE).iso