diff --git a/CHANGELOG.md b/CHANGELOG.md index bbcf09b77f..fc933c18cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [2.0.80] - 2024-00-00 + +### Added + +- Adds option for setting System Resuce password + +### Removed + +- Scientific Linux (EOL) + ## [2.0.79] - 2024-05-25 ### Added diff --git a/README.md b/README.md index 2a50d7760f..c8d0e7347c 100644 --- a/README.md +++ b/README.md @@ -171,7 +171,6 @@ In addition to being able to host netboot.xyz locally, you can also create your | Red Hat Enterprise Linux | https://www.redhat.com | User supplied media | No | | Regolith | https://regolith-linux.org | No | Yes | | Rocky Linux | https://rockylinux.org/ | Yes | No | -| Scientific Linux | https://scientificlinux.org | Yes | No | | Septor | https://septor.sourceforge.io | No | Yes | | Slackware | https://www.slackware.com | Yes | No | | SmartOS | https://www.smartos.org/ | Yes | No | diff --git a/endpoints.yml b/endpoints.yml index 8069807df4..86e3e49c76 100644 --- a/endpoints.yml +++ b/endpoints.yml @@ -71,23 +71,23 @@ endpoints: flavor: mate kernel: debian-10-live-kernel kali-xfce-squash: - path: /debian-squash/releases/download/2024.1-54fc2a3c/ + path: /debian-squash/releases/download/2024.2-54fc2a3c/ files: - filesystem.squashfs - initrd - vmlinuz os: kali - version: '2024.1' + version: '2024.2' flavor: xfce kernel: kali-xfce-squash kde-neon-user: - path: /ubuntu-squash/releases/download/20240522-1729-9b372e2a/ + path: /ubuntu-squash/releases/download/20240704-0716-9b372e2a/ files: - vmlinuz - filesystem.squashfs - initrd.lz os: neon - version: 20240522-1729 + version: 20240704-0716 flavor: user kernel: kde-neon-user regolith-current: @@ -150,7 +150,7 @@ endpoints: os: dban version: 2.3.0 sparky-stable-mingui: - path: /debian-squash/releases/download/7.3-6c87e83c/ + path: /debian-squash/releases/download/7.4-6c87e83c/ files: - filesystem.squashfs - initrd @@ -160,7 +160,7 @@ endpoints: flavor: xfce-min kernel: sparky-stable-mingui sparky-stable-gui: - path: /debian-squash/releases/download/7.3-d38c17d0/ + path: /debian-squash/releases/download/7.4.1-d38c17d0/ files: - filesystem.squashfs - initrd @@ -170,7 +170,7 @@ endpoints: flavor: xfce kernel: sparky-stable-gui sparky-stable-lxqt: - path: /debian-squash/releases/download/7.3-f9c9e1f1/ + path: /debian-squash/releases/download/7.4-f9c9e1f1/ files: - filesystem.squashfs - initrd @@ -245,7 +245,7 @@ endpoints: version: '2' flavor: ascii grml-full: - path: /debian-squash/releases/download/2022.11-35e8171b/ + path: /debian-squash/releases/download/2024.02-e064bb32/ files: - filesystem.squashfs - initrd @@ -254,7 +254,7 @@ endpoints: version: '2022.11' flavor: full grml-small: - path: /debian-squash/releases/download/2022.11-aedcf620/ + path: /debian-squash/releases/download/2024.02-7d326c39/ files: - filesystem.squashfs - initrd @@ -390,14 +390,14 @@ endpoints: flavor: kde kernel: manjaro-kde-current fatdog: - path: /asset-mirror/releases/download/901-ddcb82ff/ + path: /asset-mirror/releases/download/902-ddcb82ff/ files: - vmlinuz - initrd os: fatdog version: current raizo: - path: /debian-squash/releases/download/v15.24.03.09p-cdb1c06f/ + path: /debian-squash/releases/download/v15.24.06.08i-cdb1c06f/ files: - filesystem.squashfs - initrd @@ -405,7 +405,7 @@ endpoints: os: raizo version: current 4mlinux: - path: /asset-mirror/releases/download/45.0-c292230f/ + path: /asset-mirror/releases/download/45.1-c292230f/ files: - initrd - vmlinuz @@ -552,7 +552,7 @@ endpoints: version: 5.8 kernel: linux-lite-5-squash vyos-rolling: - path: /debian-squash/releases/download/1.5-rolling-202405240020-0956eeaa/ + path: /debian-squash/releases/download/1.5-rolling-202407100021-0956eeaa/ files: - filesystem.squashfs - initrd @@ -751,28 +751,28 @@ endpoints: flavor: bullseye kernel: voyager-bullseye-squash memtest86: - path: /asset-mirror/releases/download/10.7-2ae1d21b/ + path: /asset-mirror/releases/download/11.0-2ae1d21b/ files: - memtest86-usb.img os: memtest86-free - version: '10.7' + version: '11.0' gentoo-x86: - path: /asset-mirror/releases/download/20240129T170346Z-5b773f72/ + path: /asset-mirror/releases/download/20240614T220409Z-5b773f72/ files: - image.squashfs - initrd - vmlinuz os: gentoo - version: 20240129T170346Z + version: 20240614T220409Z arch: x86 gentoo-arm64: - path: /asset-mirror/releases/download/20240428T234907Z-d5972d15/ + path: /asset-mirror/releases/download/20240630T230404Z-d5972d15/ files: - image.squashfs - initrd - vmlinuz os: gentoo - version: 20240428T234907Z + version: 20240630T230404Z arch: arm64 gentoo-amd64: path: /asset-mirror/releases/download/20240317T170433Z-63d6ec39/ @@ -784,15 +784,14 @@ endpoints: version: 20240317T170433Z arch: amd64 tails: - path: /asset-mirror/releases/download/6.2-cfd50f75/ + path: /asset-mirror/releases/download/6.4-cfd50f75/ files: - vmlinuz - initrd.img - 9990-misc-helpers.sh - - tails-amd64-6.1.iso - - tails-amd64-6.2.iso + - tails-amd64-6.4.iso os: tails - version: '6.2' + version: '6.4' arch: amd64 hrmpf: path: /asset-mirror/releases/download/20231124-1008bb6d/ @@ -866,68 +865,68 @@ endpoints: version: 2023.03.02 arch: i686 clonezilla-debian-stable-i686: - path: /debian-squash/releases/download/3.1.2-22-ef1ff756/ + path: /debian-squash/releases/download/3.1.3-11-ef1ff756/ files: - filesystem.squashfs - initrd - vmlinuz os: clonezilla - version: 3.1.2-22 + version: 3.1.3-11 flavor: stable kernel: clonezilla-debian-stable-i686 arch: i686 clonezilla-debian-stable-amd64: - path: /debian-squash/releases/download/3.1.2-22-5641363c/ + path: /debian-squash/releases/download/3.1.3-11-5641363c/ files: - filesystem.squashfs - initrd - vmlinuz os: clonezilla - version: 3.1.2-22 + version: 3.1.3-11 flavor: stable kernel: clonezilla-debian-stable-amd64 arch: amd64 clonezilla-ubuntu-stable-amd64: - path: /ubuntu-squash/releases/download/20240408-noble-48403403/ + path: /ubuntu-squash/releases/download/20240630-noble-48403403/ files: - filesystem.squashfs - initrd - vmlinuz os: clonezilla - version: 20240408-noble + version: 20240630-noble flavor: stable kernel: clonezilla-ubuntu-stable-amd64 arch: amd64 clonezilla-debian-testing-amd64: - path: /debian-squash/releases/download/3.1.3-2-9e73bfe5/ + path: /debian-squash/releases/download/3.1.3-10-9e73bfe5/ files: - filesystem.squashfs - initrd - vmlinuz os: clonezilla - version: 3.1.3-2 + version: 3.1.3-10 flavor: testing kernel: clonezilla-debian-testing-amd64 arch: amd64 clonezilla-debian-testing-i686: - path: /debian-squash/releases/download/3.1.3-2-d1702a7a/ + path: /debian-squash/releases/download/3.1.3-10-d1702a7a/ files: - filesystem.squashfs - initrd - vmlinuz os: clonezilla - version: 3.1.3-2 + version: 3.1.3-10 flavor: testing kernel: clonezilla-debian-testing-i686 arch: i686 clonezilla-ubuntu-testing-amd64: - path: /ubuntu-squash/releases/download/20240521-oracular-c67d897c/ + path: /ubuntu-squash/releases/download/20240630-oracular-c67d897c/ files: - filesystem.squashfs - initrd - vmlinuz os: clonezilla - version: 20240521-oracular + version: 20240630-oracular flavor: testing kernel: clonezilla-ubuntu-testing-amd64 arch: amd64 @@ -1237,7 +1236,7 @@ endpoints: version: '4.0' arch: aarch64 harvester: - path: /asset-mirror/releases/download/v1.3.0-c82c6d22/ + path: /asset-mirror/releases/download/v1.3.1-c82c6d22/ files: - harvester-vmlinuz-amd64 - harvester-initrd-amd64 @@ -1245,7 +1244,7 @@ endpoints: - harvester-amd64.sha512 - version.yaml os: harvester - version: v1.3.0 + version: v1.3.1 linux-lite-6-squash: path: /ubuntu-squash/releases/download/6.4-2550834c/ files: @@ -1304,22 +1303,22 @@ endpoints: version: '9' arch: aarch64 parrot-home: - path: /debian-squash/releases/download/6.0-874f57da/ + path: /debian-squash/releases/download/6.1-897b335c/ files: - filesystem.squashfs - initrd - vmlinuz os: parrot - version: '6.0' + version: '6.1' flavor: home parrot-security: - path: /debian-squash/releases/download/6.0-6288c350/ + path: /debian-squash/releases/download/6.1-6288c350/ files: - filesystem.squashfs - initrd - vmlinuz os: parrot - version: '6.0' + version: '6.1' flavor: security xcp-ng: path: /asset-mirror/releases/download/8.2-55521b28/ @@ -1444,14 +1443,14 @@ endpoints: version: 38 flavor: Xfce debian-12-live-kernel: - path: /debian-core-12/releases/download/12.5.0-e814dabe/ + path: /debian-core-12/releases/download/12.6.0-e814dabe/ files: - initrd - vmlinuz os: debian version: '12' debian-12-default-squash: - path: /debian-squash/releases/download/12.5.0-b545a82c/ + path: /debian-squash/releases/download/12.6.0-b545a82c/ files: - filesystem.squashfs os: debian @@ -1459,7 +1458,7 @@ endpoints: flavor: core kernel: debian-12-live-kernel debian-12-gnome-squash: - path: /debian-squash/releases/download/12.5.0-d2c07a8a/ + path: /debian-squash/releases/download/12.6.0-d2c07a8a/ files: - filesystem.squashfs os: debian @@ -1467,7 +1466,7 @@ endpoints: flavor: gnome kernel: debian-12-live-kernel debian-12-cinnamon-squash: - path: /debian-squash/releases/download/12.5.0-c84a8c03/ + path: /debian-squash/releases/download/12.6.0-c84a8c03/ files: - filesystem.squashfs os: debian @@ -1475,7 +1474,7 @@ endpoints: flavor: cinnamon kernel: debian-12-live-kernel debian-12-lxqt-squash: - path: /debian-squash/releases/download/12.5.0-43f2cd09/ + path: /debian-squash/releases/download/12.6.0-43f2cd09/ files: - filesystem.squashfs os: debian @@ -1483,7 +1482,7 @@ endpoints: flavor: lxqt kernel: debian-12-live-kernel debian-12-mate-squash: - path: /debian-squash/releases/download/12.5.0-1a8949e5/ + path: /debian-squash/releases/download/12.6.0-1a8949e5/ files: - filesystem.squashfs os: debian @@ -1491,7 +1490,7 @@ endpoints: flavor: mate kernel: debian-12-live-kernel debian-12-lxde-squash: - path: /debian-squash/releases/download/12.5.0-b3449bd8/ + path: /debian-squash/releases/download/12.6.0-b3449bd8/ files: - filesystem.squashfs os: debian @@ -1499,7 +1498,7 @@ endpoints: flavor: lxde kernel: debian-12-live-kernel debian-12-xfce-squash: - path: /debian-squash/releases/download/12.5.0-40a848cc/ + path: /debian-squash/releases/download/12.6.0-40a848cc/ files: - filesystem.squashfs os: debian @@ -1507,7 +1506,7 @@ endpoints: flavor: xfce kernel: debian-12-live-kernel debian-12-kde-squash: - path: /debian-squash/releases/download/12.5.0-90c96885/ + path: /debian-squash/releases/download/12.6.0-90c96885/ files: - filesystem.squashfs os: debian @@ -1656,7 +1655,7 @@ endpoints: version: 7.0.0 flavor: apppack mfsbsd-14: - path: /asset-mirror/releases/download/14.0-a5094acd/ + path: /asset-mirror/releases/download/14.1-a5094acd/ files: - default.img - special-edition.img @@ -1673,21 +1672,21 @@ endpoints: flavor: Core kernel: zorin-core-squash q4os-plasma-squash: - path: /debian-squash/releases/download/5.4-3af797cd/ + path: /debian-squash/releases/download/5.5-3af797cd/ files: - filesystem.squashfs os: Q4OS - version: '5.4' + version: '5.5' flavor: plasma kernel: q4os-default-squash q4os-default-squash: - path: /debian-squash/releases/download/5.4-d1a34866/ + path: /debian-squash/releases/download/5.5-d1a34866/ files: - filesystem.squashfs - initrd - vmlinuz os: Q4OS - version: '5.4' + version: '5.5' flavor: trinity kernel: q4os-default-squash memtest86plus: diff --git a/roles/netbootxyz/defaults/main.yml b/roles/netbootxyz/defaults/main.yml index 3cb53da74b..2ab5c73bc4 100644 --- a/roles/netbootxyz/defaults/main.yml +++ b/roles/netbootxyz/defaults/main.yml @@ -158,8 +158,8 @@ releases: mirror: mirrors.kernel.org name: Arch Linux versions: - - code_name: 2024.05.01 - name: 2024.05.01 + - code_name: 2024.06.01 + name: 2024.06.01 blackarch: enabled: true menu: linux @@ -182,8 +182,6 @@ releases: name: 8.x Latest - code_name: 8-stream name: 8.0 Stream - - code_name: 7 - name: 7.x Latest coreos: base_dir: prod/streams enabled: true @@ -191,11 +189,11 @@ releases: mirror: https://builds.coreos.fedoraproject.org name: Fedora CoreOS versions: - - code_name: 40.20240504.3.0 + - code_name: 40.20240602.3.0 name: stable - - code_name: 40.20240519.2.0 + - code_name: 40.20240616.2.0 name: testing - - code_name: 40.20240519.1.0 + - code_name: 40.20240616.1.0 name: next debian: archive_mirror: http://archive.debian.org @@ -291,8 +289,8 @@ releases: mirror: https://downloads.ipfire.org name: IPFire versions: - - code_name: 2.29-core185 - name: 2.29 Core185 + - code_name: 2.29-core186 + name: 2.29 Core186 k3os: enabled: true menu: linux @@ -338,6 +336,8 @@ releases: name: nixos-23.05 - code_name: nixos-23.11 name: nixos-23.11 + - code_name: nixos-24.05 + name: nixos-24.05 - code_name: nixos-unstable name: nixos-unstable openEuler: @@ -383,12 +383,10 @@ releases: mirror: http://download.opensuse.org name: openSUSE versions: + - code_name: '15.6' + name: openSUSE Leap 15.6 - code_name: '15.5' name: openSUSE Leap 15.5 - - code_name: '15.4' - name: openSUSE Leap 15.4 - - code_name: '15.3' - name: openSUSE Leap 15.3 - code_name: tumbleweed name: openSUSE tumbleweed oracle: @@ -423,21 +421,6 @@ releases: name: 9 (Latest) - code_name: 8 name: 8 (Latest) - scientific: - base_dir: linux/scientific - enabled: true - menu: linux - mirror: http://ftp1.scientificlinux.org - name: Scientific Linux - versions: - - code_name: '7.9' - name: '7.9' - - code_name: '7.8' - name: '7.8' - - code_name: '7.7' - name: '7.7' - - code_name: '7.6' - name: '7.6' slackware: base_dir: slackware enabled: true @@ -460,14 +443,14 @@ releases: mirror: https://netboot.smartos.org/os/ name: SmartOS versions: + - code_name: 20240613T000428Z + name: 20240613T000428Z + - code_name: 20240530T000454Z + name: 20240530T000454Z - code_name: 20240516T000925Z name: 20240516T000925Z - code_name: 20240502T000615Z name: 20240502T000615Z - - code_name: 20240418T000439Z - name: 20240418T000439Z - - code_name: 20240404T141941Z - name: 20240404T141941Z talos: enabled: true menu: linux diff --git a/roles/netbootxyz/templates/menu/centos.ipxe.j2 b/roles/netbootxyz/templates/menu/centos.ipxe.j2 index 4390d33545..d281a86bdb 100644 --- a/roles/netbootxyz/templates/menu/centos.ipxe.j2 +++ b/roles/netbootxyz/templates/menu/centos.ipxe.j2 @@ -22,8 +22,6 @@ isset ${osversion} || choose osversion || goto linux_menu echo ${cls} iseq ${os_arch} x86_64 && set dir ${centos_base_dir}/${osversion}/BaseOS/${os_arch}/os || iseq ${os_arch} aarch64 && set dir altarch/${osversion}/BaseOS/${os_arch}/os || -iseq ${os_arch} x86_64 && iseq ${osversion} 7 && set dir ${centos_base_dir}/${osversion}/os/${os_arch} || -iseq ${os_arch} aarch64 && iseq ${osversion} 7 && set dir altarch/${osversion}/os/${os_arch} || set repo ${centos_mirror}/${dir} goto boottype diff --git a/roles/netbootxyz/templates/menu/scientific.ipxe.j2 b/roles/netbootxyz/templates/menu/scientific.ipxe.j2 deleted file mode 100644 index 2e2d7b53c7..0000000000 --- a/roles/netbootxyz/templates/menu/scientific.ipxe.j2 +++ /dev/null @@ -1,59 +0,0 @@ -#!ipxe - -# Scientific Linux Operating System -# https://www.scientificlinux.org/ - -isset ${dhcp-server} && set ipparam ip=dhcp || set ipparam ip=${ip}::${gateway}:${netmask}:::none nameserver=${dns} -set ipparam BOOTIF=${netX/mac} ${ipparam} - -goto ${menu} || - -:scientific -clear osversion -set os Scientific Linux -menu ${os} ${arch} -{% for item in releases.scientific.versions %} -item {{ item.code_name }} ${space} ${os} {{ item.name }} -{% endfor %} -item other Choose other version [o] -isset ${osversion} || choose osversion || goto linux_menu -iseq ${osversion} other || goto scientific_skip_read_osversion -echo ${cls} -echo -n Enter version: ${} && read osversion -:scientific_skip_read_osversion -set dir ${scientific_base_dir}/${osversion}/${arch}/os -set repo ${scientific_mirror}/${dir} - -goto boottype - -:boottype -set ova ${os} ${osversion} -menu ${os} ${arch} boot type -item normal ${ova} -item rescue ${ova} rescue -item kickstart ${ova} specify kickstart url -isset ${bt} || choose bt || goto scientific -echo ${cls} -iseq ${bt} rescue && goto rescue || -iseq ${bt} kickstart && goto kickstart || -goto bootos_images - -:rescue -set params inst.rescue || -goto bootos_images - -:kickstart -echo -n Specify kickstart URL for ${os} ${osversion}: && read ksurl -set params ks=${ksurl} || -goto bootos_images - -:bootos_images -imgfree -kernel ${scientific_mirror}/${dir}/images/pxeboot/vmlinuz repo=${repo} ${params} ${ipparam} {{ kernel_params }} -initrd ${scientific_mirror}/${dir}/images/pxeboot/initrd.img -boot -goto linux_menu - -:linux_menu -clear menu -exit 0 diff --git a/roles/netbootxyz/templates/menu/systemrescue.ipxe.j2 b/roles/netbootxyz/templates/menu/systemrescue.ipxe.j2 index ff243a1881..a46bf620d3 100644 --- a/roles/netbootxyz/templates/menu/systemrescue.ipxe.j2 +++ b/roles/netbootxyz/templates/menu/systemrescue.ipxe.j2 @@ -5,6 +5,8 @@ goto ${menu} || :live_menu set os System Rescue set os_arch ${arch} +isset ${rootpass_enabled} || set rootpass_enabled false +set rootpass ${mac:hexraw} iseq ${os_arch} x86_64 && set os_arch amd64 || iseq ${os_arch} i386 && set os_arch i686 || menu ${os} @@ -15,6 +17,7 @@ item --gap ${os} Versions iseq ${os_arch} {{ value.arch }} && item {{ value.version }}_${os_arch} ${space} ${os} {{ value.version }} || {% endif %} {% endfor %} +item rootpass_mac Enable rootpass=${rootpass} [ enabled: ${rootpass_enabled} ] choose live_version || goto live_exit goto ${live_version} @@ -27,9 +30,14 @@ goto boot {% endif %} {% endfor %} +:rootpass_mac +clear params +iseq ${rootpass_enabled} true && set rootpass_enabled false || set rootpass_enabled true && set params rootpass=${rootpass} +goto live_menu + :boot imgfree -kernel ${url}vmlinuz archisobasedir=sysresccd ${ipparam} archiso_http_srv=${url} {{ kernel_params }} +kernel ${url}vmlinuz archisobasedir=sysresccd ${ipparam} archiso_http_srv=${url} ${params} {{ kernel_params }} initrd ${url}initrd boot diff --git a/version.txt b/version.txt index 6c1429ae52..1c8a624837 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.0.79 +2.0.80