X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcdrom;h=79920b8ddbb787ad555ad4392e5822d09a08c12e;hp=f5520dca20823b4d72483d185f7f546776bda66a;hb=30986dbf03b2ce231f3a53989d4d81ec7ccb1681;hpb=851e6cf54b54b2046eb84a46eb133ce5973b2df6 diff --git a/lfs/cdrom b/lfs/cdrom index f5520dca20..79920b8ddb 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) tar -x -C /tmp -f /$(SNAME).tar rm -f /$(SNAME).tar @mkdir /tmp/sys - cd /tmp && tar cf /install/cdrom/$(SNAME)-$(VERSION).tlz $(TAR_OPTIONS) * && rm -rf * + cd /tmp && tar cf /install/cdrom/distro.img $(TAR_OPTIONS) * && rm -rf * # Other files touch /install/cdrom/$(SNAME)-$(VERSION)-core$(CORE).media @@ -86,16 +86,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp $(DIR_SRC)/doc/COPYING /install/cdrom/ cp $(DIR_SRC)/doc/{ChangeLog,packages-list.txt} /install/cdrom/doc - # Configuration - mkdir -p /install/cdrom/boot - cp $(DIR_SRC)/config/syslinux/unattended.conf /install/cdrom/boot/unattended.conf - # Make the ISO mkdir -p /install/cdrom/boot/isolinux dd if=/dev/zero bs=1k count=2 > /install/cdrom/boot/isolinux/boot.catalog ifneq "$(MACHINE_TYPE)" "arm" cp /boot/vmlinuz-$(KVER)-ipfire /install/cdrom/boot/isolinux/vmlinuz - dracut --force -a "installer" --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire + dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire cp $(DIR_SRC)/config/syslinux/boot.png /install/cdrom/boot/isolinux/boot.png cp /usr/lib/memtest86+/memtest.bin /install/cdrom/boot/isolinux/memtest cp /usr/share/ipfire-netboot/ipxe.lkrn /install/cdrom/boot/isolinux/netboot