]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Revert "cdrom: Disable memtest on x86_64"
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 15 Sep 2015 18:46:37 +0000 (20:46 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 15 Sep 2015 18:46:37 +0000 (20:46 +0200)
This reverts commit 5d1c3aca0ab582ed3bca4d28e148a336e2a50b08.

lfs/cdrom

index 3a959111325de4cfbacca7b2daa2d03af38a7a5b..79920b8ddbb787ad555ad4392e5822d09a08c12e 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -93,9 +93,7 @@ ifneq "$(MACHINE_TYPE)" "arm"
        cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
        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
-ifeq "$(MACHINE)" "i586"
        cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest
-endif
        cp /usr/share/ipfire-netboot/ipxe.lkrn      /install/cdrom/boot/isolinux/netboot
        cp /usr/share/syslinux/isolinux.bin         /install/cdrom/boot/isolinux/isolinux.bin
        cp /usr/share/hwdata/pci.ids                /install/cdrom/boot/isolinux/pci.ids