diff options
| author | Christian Neukirchen <chneukirchen@gmail.com> | 2015-10-09 18:54:41 +0200 |
|---|---|---|
| committer | Christian Neukirchen <chneukirchen@gmail.com> | 2015-10-09 19:53:56 +0200 |
| commit | 52a90375fbf84695e12bb236b7ed0ca9184ab988 (patch) | |
| tree | b0b7ad71829f3351e3f200d3ff4e648085f5cb78 | |
| parent | 6b53ff273acd003e322f0d4466dd46e7eacb7bbd (diff) | |
| download | hrmpf-52a90375fbf84695e12bb236b7ed0ca9184ab988.tar.gz hrmpf-52a90375fbf84695e12bb236b7ed0ca9184ab988.tar.xz hrmpf-52a90375fbf84695e12bb236b7ed0ca9184ab988.zip | |
use memtest86+ from official iso.
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | extra/memtest86+-5.01.iso | bin | 0 -> 1839104 bytes | |||
| -rw-r--r-- | isolinux/isolinux.cfg.in | 8 | ||||
| -rwxr-xr-x | mkhrmpf.sh | 1 | ||||
| -rw-r--r-- | mklive.sh.in | 3 |
5 files changed, 8 insertions, 6 deletions
diff --git a/README.md b/README.md index 9837e96..4514719 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ _ __ | |_ _ _ _ __ _ __ / _| | ' \| '_| ' \| '_ \ _| - |_||_|_| |_|_|_| .__/_| version 0.1 "Kiasoachbomba" + |_||_|_| |_|_|_| .__/_| version 0.1.90 "Kiasoachbomba" |_| Welcome to the hrmpf rescue system, built on Void Linux. diff --git a/extra/memtest86+-5.01.iso b/extra/memtest86+-5.01.iso new file mode 100644 index 0000000..671bf06 --- /dev/null +++ b/extra/memtest86+-5.01.iso Binary files differdiff --git a/isolinux/isolinux.cfg.in b/isolinux/isolinux.cfg.in index a143fc9..06196bb 100644 --- a/isolinux/isolinux.cfg.in +++ b/isolinux/isolinux.cfg.in @@ -29,15 +29,17 @@ MENU LABEL @@BOOT_TITLE@@ @@KERNVER@@ @@ARCH@@ (RAM) KERNEL /boot/vmlinuz APPEND initrd=/boot/initrd root=live:CDLABEL=VOID_LIVE init=/sbin/init ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ rd.live.ram LABEL memtest86+ -MENU LABEL memtest86+ -KERNEL /boot/memtest86+ +MENU LABEL memtest86+ 5.01 +KERNEL memdisk +INITRD /boot/memtest86+-5.01.iso +APPEND iso LABEL mhdd32 MENU LABEL MHDD32 v4.6 Hard Drive Analysis Tool KERNEL memdisk INITRD /boot/mhdd32ver4.6.iso APPEND iso LABEL ipxe -MENU LABEL iPXE +MENU LABEL iPXE 1.0.0+ KERNEL memdisk INITRD /boot/ipxe.iso APPEND iso diff --git a/mkhrmpf.sh b/mkhrmpf.sh index fbe0199..be753c0 100755 --- a/mkhrmpf.sh +++ b/mkhrmpf.sh @@ -8,4 +8,5 @@ -B extra/balder10.img \ -B extra/mhdd32ver4.6.iso \ -B extra/ipxe.iso \ + -B extra/memtest86+-5.01.iso \ -p "$(cat hrmpf.packages)" diff --git a/mklive.sh.in b/mklive.sh.in index cdd3231..4838449 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -28,7 +28,7 @@ #- trap "error_out $LINENO $?" INT TERM 0 -readonly REQUIRED_PKGS="base-files libgcc dash coreutils sed tar gawk syslinux grub-x86_64-efi squashfs-tools xorriso memtest86+" +readonly REQUIRED_PKGS="base-files libgcc dash coreutils sed tar gawk syslinux grub-x86_64-efi squashfs-tools xorriso" readonly INITRAMFS_PKGS="binutils xz device-mapper" readonly PROGNAME=$(basename $0) @@ -151,7 +151,6 @@ generate_initramfs() { mv $ROOTFS/boot/initrd $BOOT_DIR cp $ROOTFS/boot/vmlinuz-$KERNELVERSION $BOOT_DIR/vmlinuz - cp $ROOTFS/boot/memtest86+ $BOOT_DIR if [ "$BOOT_FILES" ]; then cp $BOOT_FILES $BOOT_DIR fi |