X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcdrom;h=f18b80a033dc57bf13c9350789e100aa032ecf52;hp=35fe7ebe766abfa821682214a28fa7e0a43f0e56;hb=HEAD;hpb=260d9e7dd8bcc1b1f8969535d18a314a1ad0c49c

diff --git a/lfs/cdrom b/lfs/cdrom
index 35fe7ebe76..fed69f1715 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -35,7 +35,6 @@ SHELL=/bin/bash -o pipefail
 HAS_MEMTEST = 0
 HAS_IPXE = 0
 HAS_ISOLINUX = 0
-HAS_KERNEL = 1
 
 ifeq "$(BUILD_PLATFORM)" "x86"
 	HAS_MEMTEST = 1
@@ -43,10 +42,6 @@ ifeq "$(BUILD_PLATFORM)" "x86"
 	HAS_ISOLINUX = 1
 endif
 
-ifeq "$(BUILD_ARCH)" "armv6l"
-	HAS_KERNEL = 0
-endif
-
 ISO_ARGS = -J -r -v \
 	-A "$(NAME) $(VERSION) $(BUILD_ARCH)" \
 	-V "$(NAME) $(VERSION) $(BUILD_ARCH)"
@@ -123,6 +118,8 @@ GRUB_EFI_MODULES = \
 	true \
 	usb_keyboard
 
+ISO_FILE = /install/images/$(SNAME)-$(VERSION)-core$(CORE)-$(BUILD_ARCH).iso
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -133,7 +130,7 @@ check :
 
 download :
 
-md5 :
+b2 :
 
 ###############################################################################
 # Installation Details
@@ -149,7 +146,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# Clear mtab (prevents .journal problems)
 	rm -vf /etc/mtab
-	echo > /etc/mtab
+	ln -s /proc/self/mounts /etc/mtab
 
 	# Create filelist for packaging.
 	BUILDTARGET="$(BUILDTARGET)" BUILD_ARCH="$(BUILD_ARCH)" KVER="$(KVER)" \
@@ -179,10 +176,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	mkdir -p $(DIR_TMP)/cdrom/boot/isolinux
 
-ifeq "$(HAS_KERNEL)" "1"
 	cp /boot/vmlinuz-$(KVER)-ipfire $(DIR_TMP)/cdrom/boot/isolinux/vmlinuz
 	dracut --force -a "installer" --strip $(DIR_TMP)/cdrom/boot/isolinux/instroot $(KVER)-ipfire
-endif
 
 ifeq "$(HAS_ISOLINUX)" "1"
 	dd if=/dev/zero  bs=1k count=2            > $(DIR_TMP)/cdrom/boot/isolinux/boot.catalog
@@ -197,7 +192,7 @@ endif
 
 ifeq "$(HAS_MEMTEST)" "1"
 	# Install memtest
-	cp /usr/lib/memtest86+/memtest.bin $(DIR_TMP)/cdrom/boot/isolinux/memtest
+	cp /usr/lib/memtest86+/memtest.efi $(DIR_TMP)/cdrom/boot/isolinux/memtest
 endif
 
 ifeq "$(HAS_IPXE)" "1"
@@ -225,7 +220,7 @@ ifeq "$(EFI)" "1"
 		< $(DIR_SRC)/config/cdrom/grub.cfg > $(DIR_TMP)/cdrom/EFI/BOOT/grub.cfg
 
 	# Create the EFI Eltorito image
-	dd if=/dev/zero of=$(DIR_TMP)/cdrom/boot/isolinux/efiboot.img bs=1k count=1440
+	dd if=/dev/zero of=$(DIR_TMP)/cdrom/boot/isolinux/efiboot.img bs=1k count=2880
 	mkdosfs -F 12 -n "IPFIRE_EFI" $(DIR_TMP)/cdrom/boot/isolinux/efiboot.img
 
 	# Mount the EFI image
@@ -246,9 +241,8 @@ endif
 						xargs md5sum > md5sum.txt
 
 	mkdir -p /install/images
-	cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) \
-		-o /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso .
+	cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) -o $(ISO_FILE) .
 
 ifeq "$(HAS_ISOLINUX)" "1"
-	isohybrid $(ISOHYBRID_ARGS) /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso
+	isohybrid $(ISOHYBRID_ARGS) $(ISO_FILE)
 endif