Merge pull request #14 from netbootxyz/v2-working

Move http protocol to defaults from main templates
This commit is contained in:
Antony Messerli 2019-11-24 14:17:35 -06:00 committed by GitHub
commit 58bae264d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 46 additions and 44 deletions

View file

@ -19,6 +19,7 @@ ipxe_source_dir: /usr/src/ipxe
live_endpoint: "https://github.com/netbootxyz"
netbootxyz_root: /var/www/html
bootloader_filename: ipxe-bootloader
bootloader_tftp_enabled: false
bootloader_https_enabled: true
bootloader_http_enabled: true
@ -76,8 +77,8 @@ releases:
code_name: "beta"
debian:
name: "Debian"
mirror: "deb.debian.org"
archive_mirror: "archive.debian.org"
mirror: "http://deb.debian.org"
archive_mirror: "http://archive.debian.org"
base_dir: "debian"
enabled: true
menu: "linux"
@ -98,7 +99,7 @@ releases:
code_name: "sid"
devuan:
name: "Devuan"
mirror: "auto.mirror.devuan.org"
mirror: "http://auto.mirror.devuan.org"
base_dir: "devuan"
enabled: true
menu: "linux"
@ -113,7 +114,7 @@ releases:
code_name: "beowulf"
fedora:
name: "Fedora"
mirror: "mirrors.kernel.org"
mirror: "http://mirrors.kernel.org"
base_dir: "fedora"
enabled: true
menu: "linux"
@ -179,7 +180,7 @@ releases:
code_name: "20160204"
ipfire:
name: "IPFire"
mirror: "downloads.ipfire.org"
mirror: "https://downloads.ipfire.org"
menu: "linux"
enabled: true
versions:
@ -252,7 +253,7 @@ releases:
code_name: "unstable"
openbsd:
name: "OpenBSD"
mirror: "ftp.openbsd.org"
mirror: "http://ftp.openbsd.org"
base_dir: "pub/OpenBSD"
enabled: true
menu: "bsd"
@ -274,8 +275,8 @@ releases:
image_ver: "66"
opensuse:
name: "OpenSUSE"
mirror: ""
base_dir: ""
mirror: "http://download.opensuse.org"
base_dir: "distribution/leap"
enabled: true
menu: "linux"
versions:
@ -298,7 +299,7 @@ releases:
code_name: "stable"
rancheros:
name: "RancherOS"
mirror: "releases.rancher.com"
mirror: "http://releases.rancher.com"
base_dir: "os/latest"
enabled: true
menu: "linux"
@ -307,7 +308,7 @@ releases:
code_name: "latest"
scientific:
name: "Scientific Linux"
mirror: "ftp1.scientificlinux.org"
mirror: "http://ftp1.scientificlinux.org"
base_dir: ""
enabled: true
menu: "linux"
@ -322,7 +323,7 @@ releases:
code_name: "6.9"
slackware:
name: "Slackware"
mirror: "mirror.rackspace.com"
mirror: "http://mirror.rackspace.com"
base_dir: "slackware"
enabled: true
menu: "linux"
@ -335,7 +336,7 @@ releases:
code_name: "14.1"
tinycore:
name: "Tiny Core Linux"
mirror: "tinycorelinux.net"
mirror: "http://tinycorelinux.net"
enabled: true
menu: "linux"
versions:
@ -347,8 +348,8 @@ releases:
code_name: "CorePlus"
ubuntu:
name: "Ubuntu"
mirror: "archive.ubuntu.com"
archive_mirror: "old-releases.ubuntu.com"
mirror: "http://archive.ubuntu.com"
archive_mirror: "http://old-releases.ubuntu.com"
base_dir: "ubuntu"
enabled: true
menu: "linux"

View file

@ -41,8 +41,8 @@
- name: Copy iPXE Bootloader template to iPXE source directory
template:
src: disks/ipxe-bootloader.j2
dest: "{{ ipxe_source_dir }}/src/ipxe-bootloader"
src: "disks/{{ bootloader_filename }}.j2"
dest: "{{ ipxe_source_dir }}/src/{{ bootloader_filename }}"
- name: Touch iPXE config local files
file:

View file

@ -17,7 +17,7 @@
shell: "{{ item }}"
with_items:
- make clean
- make EMBED=ipxe-bootloader bin-x86_64-efi/ipxe.efi
- make EMBED={{ bootloader_filename }} bin-x86_64-efi/ipxe.efi
args:
chdir: "{{ ipxe_source_dir }}/src"
tags:

View file

@ -13,7 +13,7 @@
shell: "{{ item }}"
with_items:
- make clean
- make EMBED=ipxe-bootloader bin/ipxe.dsk bin/ipxe.iso bin/ipxe.lkrn bin/ipxe.usb bin/ipxe.kpxe bin/undionly.kpxe
- make EMBED={{ bootloader_filename }} bin/ipxe.dsk bin/ipxe.iso bin/ipxe.lkrn bin/ipxe.usb bin/ipxe.kpxe bin/undionly.kpxe
args:
chdir: "{{ ipxe_source_dir }}/src"
tags:

View file

@ -77,8 +77,8 @@ goto deb_boot
:deb_boot
imgfree
echo Boot parameters: ${install_params} -- quiet ${params}
kernel http://${debian_mirror}/${dir}/linux ${install_params} ${netcfg} ${mirrorcfg} ${console} -- quiet ${params} initrd=initrd.gz
initrd http://${debian_mirror}/${dir}/initrd.gz
kernel ${debian_mirror}/${dir}/linux ${install_params} ${netcfg} ${mirrorcfg} ${console} -- quiet ${params} initrd=initrd.gz
initrd ${debian_mirror}/${dir}/initrd.gz
echo
echo MD5sums:
md5sum linux initrd.gz

View file

@ -64,8 +64,8 @@ goto devuan_boot
:devuan_boot
imgfree
echo Boot parameters: ${install_params} -- quiet ${params}
kernel http://${devuan_mirror}/${dir}/linux ${install_params} ${mirrorcfg} ${console} -- quiet ${params} initrd=initrd.gz
initrd http://${devuan_mirror}/${dir}/initrd.gz
kernel ${devuan_mirror}/${dir}/linux ${install_params} ${mirrorcfg} ${console} -- quiet ${params} initrd=initrd.gz
initrd ${devuan_mirror}/${dir}/initrd.gz
echo
echo MD5sums:
md5sum linux initrd.gz

View file

@ -12,8 +12,8 @@ goto ${menu} ||
clear osversion
clear sku_type
clear ova
set os Fedora
menu Fedora - ${arch} - Image Sig Checks: [${img_sigs_enabled}]
set os {{ releases.fedora.name }}
menu ${os} - ${arch} - Image Sig Checks: [${img_sigs_enabled}]
item --gap Latest Releases
{% for item in releases.fedora.versions %}
item {{ item.code_name }} ${space} ${os} {{ item.name }}
@ -60,8 +60,8 @@ goto boot
:boot
imgfree
kernel http://${fedora_mirror}/${dir}/images/pxeboot/vmlinuz repo=http://${fedora_mirror}/${dir} ${params} ${console} ${ipparam} initrd=initrd.img
initrd http://${fedora_mirror}/${dir}/images/pxeboot/initrd.img
kernel ${fedora_mirror}/${dir}/images/pxeboot/vmlinuz repo=${fedora_mirror}/${dir} ${params} ${console} ${ipparam} initrd=initrd.img
initrd ${fedora_mirror}/${dir}/images/pxeboot/initrd.img
echo
echo MD5sums:
md5sum vmlinuz initrd.img

View file

@ -20,8 +20,8 @@ goto ipfire_images
:ipfire_images
imgfree
kernel https://${ipfire_mirror}/${dir}/vmlinuz ${console} vga=791 initrd=instroot
initrd https://${ipfire_mirror}/${dir}/instroot
kernel ${ipfire_mirror}/${dir}/vmlinuz ${console} vga=791 initrd=instroot
initrd ${ipfire_mirror}/${dir}/instroot
echo
echo MD5sums:
md5sum vmlinuz instroot

View file

@ -51,7 +51,7 @@ goto {{ value.version }}-boot
:18.04-boot
imgfree
kernel ${kernel_url}vmlinuz ip-dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd
kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd
initrd ${kernel_url}initrd
boot

View file

@ -22,7 +22,7 @@ set openbsd_arch amd64
goto boot_openbsd
:boot_openbsd
set src http://{{ releases.openbsd.mirror }}/{{ releases.openbsd.base_dir }}/${ver}/${openbsd_arch}/cd${image_ver}.iso
set src {{ releases.openbsd.mirror }}/{{ releases.openbsd.base_dir }}/${ver}/${openbsd_arch}/cd${image_ver}.iso
imgfree
initrd ${src}
chain ${memdisk} iso raw

View file

@ -62,13 +62,14 @@ menu openSUSE - ${arch} - Image Sig Checks: [${img_sigs_enabled}]
item {{ item.code_name }} ${space} ${os} {{ item.name }}
{% endfor %}
choose version || goto opensuse_exit
set dir ${opensuse_base_dir}/${version}/repo/oss
set opensuse_mirror {{ releases.opensuse.mirror }}
set dir {{ releases.opensuse.base_dir }}/${version}/repo/oss
iseq ${version} tumbleweed && set dir ${version}/repo/oss ||
imgfree
kernel http://${opensuse_mirror}/${dir}/boot/x86_64/loader/linux
initrd http://${opensuse_mirror}/${dir}/boot/x86_64/loader/initrd
imgargs linux ${netsetup} install=http://${opensuse_mirror}/${dir} ${params} ${console} initrd=initrd
kernel ${opensuse_mirror}/${dir}/boot/x86_64/loader/linux
initrd ${opensuse_mirror}/${dir}/boot/x86_64/loader/initrd
imgargs linux ${netsetup} install=${opensuse_mirror}/${dir} ${params} ${console} initrd=initrd
echo
echo MD5sums:
md5sum linux initrd

View file

@ -22,8 +22,8 @@ goto boot
echo Login in with username: rancher, password: rancher
echo To install: ros install -d /dev/sda1
imgfree
kernel http://${url}/${folder}/vmlinuz rancher.state.autoformat=[/dev/sda] rancher.password=rancher initrd=initrd
initrd http://${url}/${folder}/initrd
kernel ${url}/${folder}/vmlinuz rancher.state.autoformat=[/dev/sda] rancher.password=rancher initrd=initrd
initrd ${url}/${folder}/initrd
boot
:rancheros_exit

View file

@ -22,7 +22,7 @@ echo ${cls}
echo -n Enter version: ${} && read osversion
:scientific_skip_read_osversion
set dir linux/scientific/${osversion}/${arch}/os
set repo http://ftp1.scientificlinux.org/${dir}
set repo {{ releases.scientific.mirror }}/${dir}
goto boottype
@ -49,8 +49,8 @@ goto bootos_images
:bootos_images
imgfree
kernel http://ftp1.scientificlinux.org/${dir}/images/pxeboot/vmlinuz repo=${repo} ${params} ${console} ${ipparam}
initrd http://ftp1.scientificlinux.org/${dir}/images/pxeboot/initrd.img
kernel {{ releases.scientific.mirror }}/${dir}/images/pxeboot/vmlinuz repo=${repo} ${params} ${console} ${ipparam}
initrd {{ releases.scientific.mirror }}/${dir}/images/pxeboot/initrd.img
boot
goto linux_menu

View file

@ -24,8 +24,8 @@ goto boot
:boot
imgfree
kernel http://${slackware_mirror}/${dir}/kernels/huge.s/bzImage
initrd http://${slackware_mirror}/${dir}/isolinux/initrd.img
kernel ${slackware_mirror}/${dir}/kernels/huge.s/bzImage
initrd ${slackware_mirror}/${dir}/isolinux/initrd.img
imgargs bzImage load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 SLACK_KERNEL=huge.s ${params} ${console}
isset ${debug} && prompt ||
boot

View file

@ -16,7 +16,7 @@ choose version || goto tinycore_exit
echo ${cls}
kernel ${memdisk} iso raw ${params}
initrd http://${tinycore_mirror}/${dir}/${version}-current.iso
initrd ${tinycore_mirror}/${dir}/${version}-current.iso
boot
:tinycore_exit

View file

@ -61,8 +61,8 @@ goto deb_boot
:deb_boot
set dir ${dir}${menu}-installer/${arch_a}
imgfree
kernel http://${ubuntu_mirror}/${dir}/linux ${install_params} ${mirrorcfg} ${console} -- quiet ${params} initrd=initrd.gz
initrd http://${ubuntu_mirror}/${dir}/initrd.gz
kernel ${ubuntu_mirror}/${dir}/linux ${install_params} ${mirrorcfg} ${console} -- quiet ${params} initrd=initrd.gz
initrd ${ubuntu_mirror}/${dir}/initrd.gz
echo
echo MD5sums:
md5sum linux initrd.gz