Преглед изворни кода

Merge pull request #1303 from netbootxyz/development

Release 2.0.73-RC
Antony Messerli пре 1 година
родитељ
комит
af7ee97626

+ 3 - 1
.github/workflows/development.yml

@@ -19,6 +19,8 @@ jobs:
       contents: read
     steps:
     - uses: actions/checkout@v4
+      with:
+        ref: development
 
     - name: Retrieve Certs
       run: |
@@ -34,7 +36,7 @@ jobs:
         ./script/build_release dev
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1-node16
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ secrets.AWS_ROLE_DEV }}
         aws-region: ${{ secrets.AWS_ACCESS_REGION }}

+ 3 - 1
.github/workflows/release-candidate.yml

@@ -19,6 +19,8 @@ jobs:
       contents: write
     steps:
     - uses: actions/checkout@v4
+      with:
+        ref: RC
 
     - name: Retrieve Certs
       run: |
@@ -37,7 +39,7 @@ jobs:
         ./script/build_release rc
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1-node16
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ secrets.AWS_ROLE_STAGING }}
         aws-region: ${{ secrets.AWS_ACCESS_REGION }}

+ 3 - 1
.github/workflows/release.yml

@@ -18,6 +18,8 @@ jobs:
       contents: write
     steps:
     - uses: actions/checkout@v4
+      with:
+        ref: master
 
     - name: Retrieve Certs
       run: |
@@ -36,7 +38,7 @@ jobs:
         ./script/build_release release
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1-node16
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ secrets.AWS_ROLE_PROD }}
         aws-region: ${{ secrets.AWS_ACCESS_REGION }}

+ 1 - 1
.github/workflows/rolling.yml

@@ -47,7 +47,7 @@ jobs:
         ./script/build_release rolling
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1-node16
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ secrets.AWS_ROLE_ROLLING }}
         aws-region: ${{ secrets.AWS_ACCESS_REGION }}

+ 15 - 0
CHANGELOG.md

@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.73] - 2023-10-13
+
+### Added
+
+- Fedora 39 stubbed out for release later this month
+- Ubuntu 23.10
+- Text UI support for Proxmox Distros
+
+### Fixed
+
+- Fixed an issue with Fedora would error with "Could not boot"
+
+### Removed
+
+- Remove AVG as it's no longer maintained
 
 ## [2.0.72] - 2023-09-15
 

Разлика између датотеке није приказан због своје велике величине
+ 117 - 117
endpoints.yml


+ 26 - 49
roles/netbootxyz/defaults/main.yml

@@ -156,8 +156,8 @@ releases:
     mirror: mirrors.kernel.org
     name: Arch Linux
     versions:
-    - code_name: 2023.09.01
-      name: 2023.09.01
+    - code_name: 2023.10.14
+      name: 2023.10.14
   blackarch:
     enabled: true
     menu: linux
@@ -189,11 +189,11 @@ releases:
     mirror: https://builds.coreos.fedoraproject.org
     name: Fedora CoreOS
     versions:
-    - code_name: 38.20230819.3.0
+    - code_name: 38.20231002.3.1
       name: stable
-    - code_name: 38.20230902.2.1
+    - code_name: 38.20231014.2.0
       name: testing
-    - code_name: 38.20230902.1.1
+    - code_name: 39.20231016.1.0
       name: next
   debian:
     archive_mirror: http://archive.debian.org
@@ -239,12 +239,12 @@ releases:
     mirror: http://mirrors.kernel.org
     name: Fedora
     versions:
+    - code_name: 39
+      name: 39
     - code_name: 38
       name: 38
     - code_name: 37
       name: 37
-    - code_name: 36
-      name: 36
   flatcar:
     enabled: true
     menu: linux
@@ -289,8 +289,8 @@ releases:
     mirror: https://downloads.ipfire.org
     name: IPFire
     versions:
-    - code_name: 2.27-core178
-      name: 2.27 Core178
+    - code_name: 2.27-core180
+      name: 2.27 Core180
   k3os:
     enabled: true
     menu: linux
@@ -343,14 +343,16 @@ releases:
     mirror: http://repo.openeuler.org
     name: openEuler
     versions:
+    - code_name: openEuler-23.09
+      name: openEuler-23.09
     - code_name: openEuler-20.03-LTS-SP3
       name: openEuler-20.03-LTS-SP3
     - code_name: openEuler-22.03-LTS
       name: openEuler-22.03-LTS
-    - code_name: openEuler-22.09
-      name: openEuler-22.09
     - code_name: openEuler-22.03-LTS-SP1
       name: openEuler-22.03-LTS-SP1
+    - code_name: openEuler-22.03-LTS-SP2
+      name: openEuler-22.03-LTS-SP2
   openbsd:
     base_dir: pub/OpenBSD
     enabled: true
@@ -358,39 +360,18 @@ releases:
     mirror: http://ftp.openbsd.org
     name: OpenBSD
     versions:
+    - code_name: '7.4'
+      image_ver: '74'
+      name: '7.4'
     - code_name: '7.3'
       image_ver: '73'
       name: '7.3'
     - code_name: '7.2'
       image_ver: '72'
       name: '7.2'
-    - code_name: '7.1'
-      image_ver: '71'
-      name: '7.1'
-    - code_name: '7.0'
-      image_ver: '70'
-      name: '7.0'
-    - code_name: '6.9'
-      image_ver: '69'
-      name: '6.9'
-    - code_name: '6.8'
-      image_ver: '68'
-      name: '6.8'
-    - code_name: '6.7'
-      image_ver: '67'
-      name: '6.7'
-    - code_name: '6.6'
-      image_ver: '66'
-      name: '6.6'
-    - code_name: '6.5'
-      image_ver: '65'
-      name: '6.5'
-    - code_name: '6.4'
-      image_ver: '64'
-      name: '6.4'
     - code_name: snapshots
-      image_ver: '69'
-      name: 6.9 Latest Snapshot
+      image_ver: '74'
+      name: 7.4 Latest Snapshot
   opensuse:
     base_dir: distribution/leap
     enabled: true
@@ -475,14 +456,14 @@ releases:
     mirror: https://netboot.joyent.com/os/
     name: SmartOS
     versions:
+    - code_name: 20231019T000454Z
+      name: 20231019T000454Z
+    - code_name: 20231005T000607Z
+      name: 20231005T000607Z
+    - code_name: 20230921T034751Z
+      name: 20230921T034751Z
     - code_name: 20230907T000420Z
       name: 20230907T000420Z
-    - code_name: 20230828T151332Z
-      name: 20230828T151332Z
-    - code_name: 20230824T000638Z
-      name: 20230824T000638Z
-    - code_name: 20230810T000714Z
-      name: 20230810T000714Z
   talos:
     enabled: true
     menu: linux
@@ -617,6 +598,8 @@ releases:
     mirror: http://archive.ubuntu.com
     name: Ubuntu
     versions:
+    - code_name: mantic
+      name: 23.10 Mantic Minotaur
     - code_name: lunar
       name: 23.04 Lunar Lobster
     - code_name: jammy
@@ -755,12 +738,6 @@ utilitiespcbios64:
     enabled: true
     name: 4MLinux
     type: ipxemenu
-  avg:
-    enabled: true
-    name: AVG Rescue CD
-    type: memdisk
-    util_path: http://download.avg.com/filedir/inst/avg_arl_cdi_all_120_160420a12074.iso
-    version: 160420a12074
   bootrepair:
     enabled: true
     initrd: ${live_endpoint}{{ endpoints.bootrepair.path }}initrd

+ 1 - 1
roles/netbootxyz/templates/menu/fedora.ipxe.j2

@@ -70,7 +70,7 @@ set params inst.ks=${ks_url} ||
 clear bt
 goto boottype
 
-:boot
+:bootos_images
 imgfree
 kernel ${fedora_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${fedora_mirror}/${dir} ${install_mode} ${params} ${ipparam} {{ kernel_params }}
 initrd ${fedora_mirror}/${dir}/images/pxeboot/initrd.img

+ 1 - 1
roles/netbootxyz/templates/menu/linux-arm.ipxe.j2

@@ -9,9 +9,9 @@ item almalinux ${space} AlmaLinux
 item alpinelinux ${space} Alpine Linux
 item centos ${space} CentOS
 item debian ${space} Debian
+item fedora ${space} Fedora
 item coreos ${space} Fedora CoreOS
 item gentoo ${space} Gentoo
-item fedora ${space} Fedora
 item nixos ${space} NixOS
 item opensuse ${space} openSUSE
 item oracle ${space} Oracle Linux

+ 10 - 0
roles/netbootxyz/templates/menu/live-ubuntu.ipxe.j2

@@ -6,6 +6,7 @@ goto ${menu} ||
 set os Ubuntu Live
 menu ${os}
 item --gap ${os} Versions
+item mantic ${space} ${os} 23.10
 item lunar ${space} ${os} 23.04
 item jammy ${space} ${os} 22.04
 item focal ${space} ${os} 20.04
@@ -15,6 +16,14 @@ menu ${os} ${live_version}
 item --gap ${os} Flavors
 goto ${live_version}
 
+:mantic
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "ubuntu" and 'squash' in key and value.version == "23.10" %}
+item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title }}
+{% endif %}
+{% endfor %}
+goto flavor_select
+
 :lunar
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "ubuntu" and 'squash' in key and value.version == "23.04" %}
@@ -75,6 +84,7 @@ boot
 :20.04-boot
 :22.04-boot
 :23.04-boot
+:23.10-boot
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd

+ 15 - 0
roles/netbootxyz/templates/menu/proxmox.ipxe.j2

@@ -14,16 +14,19 @@ menu ${os}
 {% if value.os == "proxmox-backup-server" %}
 item --gap ${os} Backup Server
 item pbs-normal ${space} ${os} Backup Server {{ value.version }}
+item pbs-text ${space} ${os} Backup Server {{ value.version }} (Text)
 item pbs-debug ${space} ${os} Backup Server {{ value.version }} (Debug)
 {% endif %}
 {% if value.os == "proxmox-mailgateway" %}
 item --gap ${os} Mail Gateway
 item pmg-normal ${space} ${os} Mail Gateway {{ value.version }}
+item pmg-text ${space} ${os} Mail Gateway {{ value.version }} (Text)
 item pmg-debug ${space} ${os} Mail Gateway {{ value.version }} (Debug)
 {% endif %}
 {% if value.os == "proxmox-ve" %}
 item --gap ${os} VE
 item pve-normal ${space} ${os} VE {{ value.version }}
+item pve-text ${space} ${os} VE {{ value.version }} (Text)
 item pve-debug ${space} ${os} VE {{ value.version }} (Debug)
 {% endif %}
 {% endfor %}
@@ -34,6 +37,10 @@ goto ${proxmox_choice}
 set params splash=silent
 goto boot-pve
 
+:pve-text
+set params splash=silent proxtui
+goto boot-pve
+
 :pve-debug
 set params splash=verbose proxdebug
 goto boot-pve
@@ -42,6 +49,10 @@ goto boot-pve
 set params splash=silent
 goto boot-pmg
 
+:pmg-text
+set params splash=silent proxtui
+goto boot-pmg
+
 :pmg-debug
 set params splash=verbose proxdebug
 goto boot-pmg
@@ -50,6 +61,10 @@ goto boot-pmg
 set params splash=silent
 goto boot-pbs
 
+:pbs-text
+set params splash=silent proxtui
+goto boot-pbs
+
 :pbs-debug
 set params splash=verbose proxdebug
 goto boot-pbs

+ 1 - 0
roles/netbootxyz/templates/menu/ubuntu.ipxe.j2

@@ -28,6 +28,7 @@ iseq ${ubuntu_version} older_release && goto older_release ||
 iseq ${ubuntu_version} focal && set install_type sub ||
 iseq ${ubuntu_version} jammy && set install_type sub ||
 iseq ${ubuntu_version} lunar && set install_type sub ||
+iseq ${ubuntu_version} mantic && set install_type sub ||
 iseq ${ubuntu_version} focal-legacy && set ubuntu_version focal ||
 iseq ${install_type} sub && goto boot_type ||
 iseq ${os_arch} arm64 && echo "arm64 not supported on legacy network installs, please use 20.04 Subiquity and up" && sleep 5 && goto ubuntu ||

+ 1 - 1
version.txt

@@ -1 +1 @@
-2.0.72
+2.0.73

Неке датотеке нису приказане због велике количине промена