From 508adeb730d530893186ad8a15e27a69f81be079 Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Thu, 26 Dec 2019 18:49:33 -0600 Subject: [PATCH 1/7] Generate version.ipxe Generates version.ipxe for upstream notificaiton for clients --- script/netbootxyz-overrides.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/script/netbootxyz-overrides.yml b/script/netbootxyz-overrides.yml index 3df8c5a541..295375cc91 100644 --- a/script/netbootxyz-overrides.yml +++ b/script/netbootxyz-overrides.yml @@ -3,6 +3,7 @@ sigs_menu: true sigs_enabled: true img_sigs_enabled: false generate_disks_arm: true +generate_version_file: true bootloader_multiple: true bootloader_disks: - "netboot.xyz" From 497fca2e2fb418759e42902d8c59496a732d731c Mon Sep 17 00:00:00 2001 From: Vincent AUBERT Date: Fri, 27 Dec 2019 13:11:14 +0100 Subject: [PATCH 2/7] fix ambiguous param in geniso image --- roles/netbootxyz/tasks/generate_disks_efi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/netbootxyz/tasks/generate_disks_efi.yml b/roles/netbootxyz/tasks/generate_disks_efi.yml index ea30d8b96c..d4c8d98d07 100644 --- a/roles/netbootxyz/tasks/generate_disks_efi.yml +++ b/roles/netbootxyz/tasks/generate_disks_efi.yml @@ -44,7 +44,7 @@ mformat -i efi_tmp/ipxe.img -m 0xf8 -f 2880 mmd -i efi_tmp/ipxe.img ::efi ::efi/boot mcopy -i efi_tmp/ipxe.img bin-x86_64-efi/ipxe.efi ::efi/boot/bootx64.efi - genisoimage -o ipxe-efi.eiso -eltorito-alt-boot -e ipxe.img -no-emul-boot efi_tmp + genisoimage -o ipxe-efi.eiso -eltorito-alt-boot -eltorito-boot ipxe.img -no-emul-boot efi_tmp args: chdir: "{{ ipxe_source_dir }}/src" warn: false From eebe6e602ec28a73b7aaacfed4b0505327a87215 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 24 Apr 2020 18:29:49 +0200 Subject: [PATCH 3/7] bump NixOS to 20.03, drop 19.03 --- roles/netbootxyz/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/netbootxyz/defaults/main.yml b/roles/netbootxyz/defaults/main.yml index 6f94da308f..ca13288ab0 100644 --- a/roles/netbootxyz/defaults/main.yml +++ b/roles/netbootxyz/defaults/main.yml @@ -267,10 +267,10 @@ releases: menu: linux name: NixOS versions: + - code_name: '20.03' + name: Nixos 20.03 - code_name: '19.09' name: Nixos 19.09 - - code_name: '19.03' - name: Nixos 19.03 openbsd: base_dir: pub/OpenBSD enabled: true From 8604e14cb02a5ff6d4fbdd8bac65c014b423d7f1 Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Wed, 9 Dec 2020 01:42:14 -0600 Subject: [PATCH 4/7] Remove tty from docker for actions workflow Hotfix to release to build --- script/build_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build_release b/script/build_release index aa0abd3cab..88124115b6 100755 --- a/script/build_release +++ b/script/build_release @@ -60,7 +60,7 @@ if [[ "${TYPE}" == "release" ]] || [[ "${TYPE}" == "rc" ]]; then -e "/^boot_domain/c\boot_domain: ${PROD_URL}" \ user_overrides.yml docker build -t localbuild -f ${DOCKER_FILE} . - docker run --rm -it -v $(pwd):/buildout localbuild + docker run --rm -i -v $(pwd):/buildout localbuild fi if [[ "${TYPE}" == "rc" ]]; then sed -i \ From fae9d8675eac2ad386aeba808d918a0741b554cc Mon Sep 17 00:00:00 2001 From: Juri Grabowski Date: Thu, 14 Oct 2021 08:58:29 +0200 Subject: [PATCH 5/7] Add Padded floppy images for some (iLO/iDRAC) Remote Management Consoles --- README.md | 1 + roles/netbootxyz/defaults/main.yml | 4 ++++ roles/netbootxyz/tasks/generate_disks_legacy.yml | 3 +++ 3 files changed, 8 insertions(+) diff --git a/README.md b/README.md index 81fe30100b..bbae9da935 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ |------|------------|-------------| |Kernel| [netboot.xyz.lkrn](https://boot.netboot.xyz/ipxe/netboot.xyz.lkrn)|Used for booting from GRUB/EXTLINUX| |Floppy| [netboot.xyz.dsk](https://boot.netboot.xyz/ipxe/netboot.xyz.dsk)| Virtual floppy disk for DRAC/iLO, VMware, Virtual Box, etc| +|Padded Floppy| [netboot.xyz.pdsk](https://boot.netboot.xyz/ipxe/netboot.xyz.pdsk)| Padded Virtual floppy disk for DRAC/iLO, VMware, Virtual Box, etc| |DHCP| [netboot.xyz.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz.kpxe)| DHCP boot image file, uses built-in iPXE NIC drivers| |DHCP-undionly| [netboot.xyz-undionly.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz-undionly.kpxe)| DHCP boot image file, use if you have NIC issues| diff --git a/roles/netbootxyz/defaults/main.yml b/roles/netbootxyz/defaults/main.yml index bc4914aa3d..02a5b8cb41 100644 --- a/roles/netbootxyz/defaults/main.yml +++ b/roles/netbootxyz/defaults/main.yml @@ -37,6 +37,10 @@ bootloaders: ipxe_bin: ipxe.dsk output_bin: .dsk type: Floppy + - desc: Padded Virtual floppy disk for DRAC/iLO, VMware, Virtual Box, etc + ipxe_bin: ipxe.pdsk + output_bin: .pdsk + type: Floppy - desc: DHCP boot image file, uses built-in iPXE NIC drivers ipxe_bin: ipxe.kpxe output_bin: .kpxe diff --git a/roles/netbootxyz/tasks/generate_disks_legacy.yml b/roles/netbootxyz/tasks/generate_disks_legacy.yml index a18a2d2384..3ebca6c879 100644 --- a/roles/netbootxyz/tasks/generate_disks_legacy.yml +++ b/roles/netbootxyz/tasks/generate_disks_legacy.yml @@ -26,6 +26,7 @@ make EMBED={{ bootloader_filename }} \ TRUST={{ trust_files }} \ bin/ipxe.dsk \ + bin/ipxe.pdsk \ bin/ipxe.lkrn \ bin/ipxe.kpxe \ bin/undionly.kpxe @@ -42,6 +43,7 @@ DEBUG={{ ipxe_debug_options }} \ TRUST={{ trust_files }} \ bin/ipxe.dsk \ + bin/ipxe.pdsk \ bin/ipxe.lkrn \ bin/ipxe.kpxe \ bin/undionly.kpxe @@ -57,6 +59,7 @@ dest: "{{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}{{ item }}" remote_src: True with_items: + - ".pdsk" - ".dsk" - ".lkrn" - ".kpxe" From a618809afe7f72a37bedb3bdd4590108dda9b56f Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Thu, 14 Oct 2021 10:17:06 -0500 Subject: [PATCH 6/7] Revert "Add Padded floppy images for some (iLO/iDRAC) Remote Management Consoles" This reverts commit fae9d8675eac2ad386aeba808d918a0741b554cc. --- README.md | 1 - roles/netbootxyz/defaults/main.yml | 4 ---- roles/netbootxyz/tasks/generate_disks_legacy.yml | 3 --- 3 files changed, 8 deletions(-) diff --git a/README.md b/README.md index bbae9da935..81fe30100b 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ |------|------------|-------------| |Kernel| [netboot.xyz.lkrn](https://boot.netboot.xyz/ipxe/netboot.xyz.lkrn)|Used for booting from GRUB/EXTLINUX| |Floppy| [netboot.xyz.dsk](https://boot.netboot.xyz/ipxe/netboot.xyz.dsk)| Virtual floppy disk for DRAC/iLO, VMware, Virtual Box, etc| -|Padded Floppy| [netboot.xyz.pdsk](https://boot.netboot.xyz/ipxe/netboot.xyz.pdsk)| Padded Virtual floppy disk for DRAC/iLO, VMware, Virtual Box, etc| |DHCP| [netboot.xyz.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz.kpxe)| DHCP boot image file, uses built-in iPXE NIC drivers| |DHCP-undionly| [netboot.xyz-undionly.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz-undionly.kpxe)| DHCP boot image file, use if you have NIC issues| diff --git a/roles/netbootxyz/defaults/main.yml b/roles/netbootxyz/defaults/main.yml index 02a5b8cb41..bc4914aa3d 100644 --- a/roles/netbootxyz/defaults/main.yml +++ b/roles/netbootxyz/defaults/main.yml @@ -37,10 +37,6 @@ bootloaders: ipxe_bin: ipxe.dsk output_bin: .dsk type: Floppy - - desc: Padded Virtual floppy disk for DRAC/iLO, VMware, Virtual Box, etc - ipxe_bin: ipxe.pdsk - output_bin: .pdsk - type: Floppy - desc: DHCP boot image file, uses built-in iPXE NIC drivers ipxe_bin: ipxe.kpxe output_bin: .kpxe diff --git a/roles/netbootxyz/tasks/generate_disks_legacy.yml b/roles/netbootxyz/tasks/generate_disks_legacy.yml index 3ebca6c879..a18a2d2384 100644 --- a/roles/netbootxyz/tasks/generate_disks_legacy.yml +++ b/roles/netbootxyz/tasks/generate_disks_legacy.yml @@ -26,7 +26,6 @@ make EMBED={{ bootloader_filename }} \ TRUST={{ trust_files }} \ bin/ipxe.dsk \ - bin/ipxe.pdsk \ bin/ipxe.lkrn \ bin/ipxe.kpxe \ bin/undionly.kpxe @@ -43,7 +42,6 @@ DEBUG={{ ipxe_debug_options }} \ TRUST={{ trust_files }} \ bin/ipxe.dsk \ - bin/ipxe.pdsk \ bin/ipxe.lkrn \ bin/ipxe.kpxe \ bin/undionly.kpxe @@ -59,7 +57,6 @@ dest: "{{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}{{ item }}" remote_src: True with_items: - - ".pdsk" - ".dsk" - ".lkrn" - ".kpxe" From c73046db4c7506e1873891170971109e907ae94e Mon Sep 17 00:00:00 2001 From: Andy Harp Date: Thu, 14 Jul 2022 14:01:54 -0500 Subject: [PATCH 7/7] Update main.yml --- roles/netbootxyz/defaults/main.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/roles/netbootxyz/defaults/main.yml b/roles/netbootxyz/defaults/main.yml index befe1fc5f9..8104e17055 100644 --- a/roles/netbootxyz/defaults/main.yml +++ b/roles/netbootxyz/defaults/main.yml @@ -120,12 +120,8 @@ releases: versions: - code_name: 9.0 name: 9.0 - - code_name: 8.3 - name: 8.3 - - code_name: 8.4 - name: 8.4 - - code_name: 8.5 - name: 8.5 + - code_name: 8.6 + name: 8.6 alpinelinux: base_dir: alpine enabled: true