X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcdrom;h=0c4668d8988c5dcb73986685f235deef041efa27;hb=a500f481856700c218d6723fa28104f1510d6abe;hp=0773547ae43d37e6351e62ca061a90ba34953a96;hpb=a01fc4746ba7fa8257e94300b4396fd6c4662f4f;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/lfs/cdrom b/lfs/cdrom index 0773547ae4..0c4668d898 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -48,6 +48,9 @@ md5 : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) rm -rf /install/cdrom /tmp/* + #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 mkdir -p /install/cdrom/doc @@ -63,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 @@ -84,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp $(DIR_SRC)/config/syslinux/options.msg /install/cdrom/boot/isolinux/options.msg; \ cp $(DIR_SRC)/config/syslinux/splash.lss /install/cdrom/boot/isolinux/splash.lss; \ cp /usr/lib/memtest86+/memtest.bin /install/cdrom/boot/isolinux/memtest; \ - cp /usr/lib/syslinux/isolinux.bin /install/cdrom/boot/isolinux/isolinux.bin; \ + cp /usr/share/syslinux/isolinux.bin /install/cdrom/boot/isolinux/isolinux.bin; \ cd /install/cdrom && find -type f ! -name md5sum.txt | grep -v "./boot" | \ xargs md5sum > md5sum.txt; \ cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \