From 6d3b3bddb8b26c0eb1fed5087f7ecff8f509bfb9 Mon Sep 17 00:00:00 2001 From: "claude[bot]" <209825114+claude[bot]@users.noreply.github.com> Date: Mon, 17 Nov 2025 02:33:02 +0000 Subject: [PATCH] fix: remove hardcoded http:// prefix from archlinux_mirror URLs Fixes issue where setting archlinux_mirror to an HTTPS URL would result in malformed URLs like http://https://mirror.example.com/... Changes: - Remove hardcoded http:// prefix from archiso_http_srv parameter - Remove hardcoded http:// prefix from kernel URL - Remove hardcoded http:// prefix from initrd URL - Add http:// prefix to default archlinux mirror for backward compatibility Now respects the protocol specified in the archlinux_mirror configuration, allowing both HTTP and HTTPS mirrors to work correctly. Fixes #1703 Co-authored-by: Antony Messerli --- roles/netbootxyz/defaults/main.yml | 2 +- roles/netbootxyz/templates/menu/archlinux.ipxe.j2 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/netbootxyz/defaults/main.yml b/roles/netbootxyz/defaults/main.yml index 496b088c6b..1e49bb8bd8 100644 --- a/roles/netbootxyz/defaults/main.yml +++ b/roles/netbootxyz/defaults/main.yml @@ -165,7 +165,7 @@ releases: base_dir: archlinux enabled: true menu: linux - mirror: mirrors.kernel.org + mirror: http://mirrors.kernel.org name: Arch Linux versions: - code_name: 2025.11.01 diff --git a/roles/netbootxyz/templates/menu/archlinux.ipxe.j2 b/roles/netbootxyz/templates/menu/archlinux.ipxe.j2 index fc9b6f93af..c10334eb85 100644 --- a/roles/netbootxyz/templates/menu/archlinux.ipxe.j2 +++ b/roles/netbootxyz/templates/menu/archlinux.ipxe.j2 @@ -36,9 +36,9 @@ iseq ${os_arch} i686 && goto boot32 || :boot imgfree set dir ${archlinux_base_dir}/iso/${arch_version}/arch/boot -set params archiso_http_srv=http://${real_archlinux_mirror}/${archlinux_base_dir}/iso/${arch_version}/ archisobasedir=arch cms_verify=y ${ipparam} net.ifnames=0 {{ kernel_params }} -kernel http://${archlinux_mirror}/${dir}/${os_arch}/vmlinuz-linux ${params} -initrd http://${archlinux_mirror}/${dir}/${os_arch}/initramfs-linux.img +set params archiso_http_srv=${real_archlinux_mirror}/${archlinux_base_dir}/iso/${arch_version}/ archisobasedir=arch cms_verify=y ${ipparam} net.ifnames=0 {{ kernel_params }} +kernel ${archlinux_mirror}/${dir}/${os_arch}/vmlinuz-linux ${params} +initrd ${archlinux_mirror}/${dir}/${os_arch}/initramfs-linux.img echo echo MD5sums: md5sum vmlinuz-linux initramfs-linux.img