Merge pull request #1098 from netbootxyz/development

Release 2.0.57-RC

.github/workflows/development.yml

@@ -15,7 +15,7 @@ jobs:
     name: Build Development
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Retrieve Certs
       run: |

.github/workflows/pull-requests.yml

@@ -12,14 +12,14 @@ jobs:
     name: Test Pull Request
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v3
 
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install ansible ansible-lint
+        pip install ansible==5.4.0 ansible-lint==5.4.0
 
     - name: Syntax Check
       run: |
@@ -33,9 +33,9 @@ jobs:
     name: Build Pull Request
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v3
 
     - name: Build PR release
       run: |

.github/workflows/release-candidate.yml

@@ -15,7 +15,7 @@ jobs:
     name: Build Release Candidate
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Retrieve Certs
       run: |

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
     name: Build Release
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Retrieve Certs
       run: |

.github/workflows/rolling.yml

@@ -17,7 +17,7 @@ jobs:
     name: Build Release
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         ref: 'master'
 

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v4
+    - uses: actions/stale@v5
       with:
         stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
         stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.57]
+#### Added
+- Proxmox Backup Server
+- Proxmox Mail Gateway
+#### Changes
+- Proxmox pulls ISO from upstream site now, consolidated Proxmox items to one menu
+
 ## [2.0.56]
 #### Fixed
 - Added a ipxe_cloud_config for packet and metal for older clients

README.md

@@ -163,7 +163,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 | Parrot Security | https://www.parrotsec.org | No | Yes |
 | Peppermint | https://peppermintos.com | No | Yes |
 | Pop OS |https://system76.com/pop| No | Yes |
-| Proxmox VE | https://www.proxmox.com/ | Yes | No |
+| Proxmox Open Source Products | https://www.proxmox.com/ | Yes | No |
 | Q4OS | https://q4os.org | No | Yes |
 | Raizo | https://sourceforge.net/projects/live-raizo/ | No | Yes |
 | RancherOS | https://rancher.com/rancher-os | Yes | No |

endpoints.yml

@@ -235,7 +235,7 @@ endpoints:
     flavor: default
     kernel: backbox-6-default-squash
   kde-neon-user:
-    path: /ubuntu-squash/releases/download/20220210-0946-92641c1f/
+    path: /ubuntu-squash/releases/download/20220317-0946-92641c1f/
     files:
     - vmlinuz
     - filesystem.squashfs
@@ -389,7 +389,7 @@ endpoints:
     flavor: lxqt
     kernel: sparky-stable-lxqt
   sparky-rolling-mingui:
-    path: /debian-squash/releases/download/2021.12-46e5b31a/
+    path: /debian-squash/releases/download/2022.03-46e5b31a/
     files:
     - filesystem.squashfs
     - initrd
@@ -399,7 +399,7 @@ endpoints:
     flavor: xfce-min
     kernel: sparky-rolling-mingui
   sparky-rolling-gui:
-    path: /debian-squash/releases/download/2021.12-d6528b1d/
+    path: /debian-squash/releases/download/2022.03-d6528b1d/
     files:
     - filesystem.squashfs
     - initrd
@@ -409,7 +409,7 @@ endpoints:
     flavor: xfce
     kernel: sparky-rolling-gui
   sparky-rolling-lxqt:
-    path: /debian-squash/releases/download/2021.12-7db481ad/
+    path: /debian-squash/releases/download/2022.03-7db481ad/
     files:
     - filesystem.squashfs
     - initrd
@@ -564,7 +564,7 @@ endpoints:
     os: blackarch
     version: current
   bluestar:
-    path: /asset-mirror/releases/download/5.16.8-2022.02.10-a3024eea/
+    path: /asset-mirror/releases/download/5.16.12-2022.03.05-a3024eea/
     files:
     - initrd
     - vmlinuz
@@ -620,7 +620,7 @@ endpoints:
     os: septor
     version: current
   manjaro-xfce-current:
-    path: /manjaro-squash/releases/download/21.2.2-220123-linux515-5726b1dc/
+    path: /manjaro-squash/releases/download/21.2.4-220301-linux515-5726b1dc/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -629,11 +629,11 @@ endpoints:
     - initrd
     - vmlinuz
     os: manjaro
-    version: 21.2.2-220123-linux515
+    version: 21.2.4-220301-linux515
     flavor: xfce
     kernel: manjaro-xfce-current
   manjaro-gnome-current:
-    path: /manjaro-squash/releases/download/21.2.2-220123-linux515-3e5e7dda/
+    path: /manjaro-squash/releases/download/21.2.4-220301-linux515-3e5e7dda/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -642,11 +642,11 @@ endpoints:
     - initrd
     - vmlinuz
     os: manjaro
-    version: 21.2.2-220123-linux515
+    version: 21.2.4-220301-linux515
     flavor: gnome
     kernel: manjaro-gnome-current
   manjaro-kde-current:
-    path: /manjaro-squash/releases/download/21.2.2-220123-linux515-aa503796/
+    path: /manjaro-squash/releases/download/21.2.4-220301-linux515-aa503796/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -655,7 +655,7 @@ endpoints:
     - initrd
     - vmlinuz
     os: manjaro
-    version: 21.2.2-220123-linux515
+    version: 21.2.4-220301-linux515
     flavor: kde
     kernel: manjaro-kde-current
   fatdog:
@@ -690,7 +690,7 @@ endpoints:
     version: current
     flavor: TheSSS
   4mlinux-bakandimg:
-    path: /asset-mirror/releases/download/38.0-262576bf/
+    path: /asset-mirror/releases/download/39.0-262576bf/
     files:
     - initrd
     - vmlinuz
@@ -698,7 +698,7 @@ endpoints:
     version: current
     flavor: BakAndImg
   4mlinux-antivirus:
-    path: /asset-mirror/releases/download/38.0-0.104.0-ba9e3ece/
+    path: /asset-mirror/releases/download/39.0-0.104.2-ba9e3ece/
     files:
     - initrd
     - vmlinuz
@@ -852,7 +852,7 @@ endpoints:
     version: 5.8
     kernel: linux-lite-5-squash
   vyos-rolling:
-    path: /debian-squash/releases/download/202202150317-fdd40a1c/
+    path: /debian-squash/releases/download/202203170822-fdd40a1c/
     files:
     - filesystem.squashfs
     - initrd
@@ -908,13 +908,13 @@ endpoints:
     flavor: gnome
     kernel: pureos-gnome
   rescuezilla:
-    path: /asset-mirror/releases/download/2.2-3cfd948a/
+    path: /asset-mirror/releases/download/2.3.1-ca5c2955/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: rescuezilla
-    version: groovy
+    version: 2.3.1
   deepin-20-squash:
     path: /debian-squash/releases/download/20.4-7aac93a9/
     files:
@@ -933,13 +933,13 @@ endpoints:
     os: ovirt
     version: '4.4'
   nitrux-release:
-    path: /ubuntu-squash/releases/download/2022.02.02-e364d0a5/
+    path: /ubuntu-squash/releases/download/2022.02.28-e364d0a5/
     files:
     - initrd
     - vmlinuz
     - filesystem.squashfs
     os: nitrux
-    version: 2022.02.02
+    version: 2022.02.28
   endeavouros:
     path: /asset-mirror/releases/download/21_4-1f037972/
     files:
@@ -1141,7 +1141,7 @@ endpoints:
     flavor: intel-amd
     kernel: pop-21.04-default-squash
   mint-lmde-cinnamon-squash:
-    path: /debian-squash/releases/download/4-073d5d42/
+    path: /debian-squash/releases/download/5-073d5d42/
     files:
     - filesystem.squashfs
     - initrd
@@ -1180,14 +1180,6 @@ endpoints:
     version: '20'
     flavor: Cinnamon
     kernel: mint-20-cinnamon-squash
-  proxmox:
-    path: /asset-mirror/releases/download/7.1-2-aed65b4b/
-    files:
-    - initrd
-    - vmlinuz
-    - proxmox.iso
-    os: proxmox
-    version: 7.1-2
   talos:
     path: /asset-mirror/releases/download/0.13.4-3f5e10e5/
     files:
@@ -1196,7 +1188,7 @@ endpoints:
     os: talos
     version: 0.13.4
   elementaryos-6-default-squash:
-    path: /ubuntu-squash/releases/download/6-c6e63f57/
+    path: /ubuntu-squash/releases/download/6-fd43c6f8/
     files:
     - initrd
     - vmlinuz
@@ -1302,34 +1294,34 @@ endpoints:
     os: memtest86-free
     version: '9.4'
   gentoo-x86:
-    path: /asset-mirror/releases/download/20220214T170538Z-6734abfd/
+    path: /asset-mirror/releases/download/20220314T170538Z-6734abfd/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20220214T170538Z
+    version: 20220314T170538Z
     arch: x86
   gentoo-arm64:
-    path: /asset-mirror/releases/download/20220123T230658Z-079d67cf/
+    path: /asset-mirror/releases/download/20220313T230453Z-079d67cf/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20220123T230658Z
+    version: 20220313T230453Z
     arch: arm64
   gentoo-amd64:
-    path: /asset-mirror/releases/download/20220217T125149Z-383e823f/
+    path: /asset-mirror/releases/download/20220315T091810Z-383e823f/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20220217T125149Z
+    version: 20220315T091810Z
     arch: amd64
   tails:
-    path: /asset-mirror/releases/download/4.27-624dc85f/
+    path: /asset-mirror/releases/download/4.28-81501ab2/
     files:
     - vmlinuz
     - initrd.img
@@ -1337,16 +1329,16 @@ endpoints:
     - 9990-misc-helpers.sh
     - tails-amd64-4.23.iso
     os: tails
-    version: '4.27'
+    version: '4.28'
     arch: amd64
   hrmpf:
-    path: /asset-mirror/releases/download/20210914-3cf8e2c5/
+    path: /asset-mirror/releases/download/20211227-bed8dd88/
     files:
     - vmlinuz
     - initrd
     - squashfs.img
     os: hrmpf
-    version: '20210914'
+    version: '20211227'
   ubuntu-netboot-20.04-arm64:
     path: /ubuntu-squash/releases/download/20.04.4-2c21f29a/
     files:
@@ -1428,13 +1420,13 @@ endpoints:
     version: v2021.08.2_21_x86-64_0.32.023
     arch: x86_64
   archlinux-32:
-    path: /asset-mirror/releases/download/2022.02.01-6dbad0f9/
+    path: /asset-mirror/releases/download/2022.03.02-6dbad0f9/
     files:
     - airootfs.sfs
     - initramfs-linux.img
     - vmlinuz-linux
     os: archlinux
-    version: 2022.02.01
+    version: 2022.03.02
     arch: i686
   q4os-4.6-default-squash:
     path: /debian-squash/releases/download/4.6-2de282e7/
@@ -1512,40 +1504,40 @@ endpoints:
     kernel: clonezilla-ubuntu-stable-amd64
     arch: amd64
   clonezilla-debian-testing-amd64:
-    path: /debian-squash/releases/download/3.0.0-3-5fb1a15b/
+    path: /debian-squash/releases/download/3.0.0-7-5fb1a15b/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 3.0.0-3
+    version: 3.0.0-7
     flavor: testing
     kernel: clonezilla-debian-testing-amd64
     arch: amd64
   clonezilla-debian-testing-i686:
-    path: /debian-squash/releases/download/3.0.0-3-ee3863df/
+    path: /debian-squash/releases/download/3.0.0-7-ee3863df/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 3.0.0-3
+    version: 3.0.0-7
     flavor: testing
     kernel: clonezilla-debian-testing-i686
     arch: i686
   clonezilla-ubuntu-testing-amd64:
-    path: /ubuntu-squash/releases/download/20220214-impish-5774fbed/
+    path: /ubuntu-squash/releases/download/20220318-impish-5774fbed/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 20220214-impish
+    version: 20220318-impish
     flavor: testing
     kernel: clonezilla-ubuntu-testing-amd64
     arch: amd64
   garuda-dr460nized-gaming:
-    path: /asset-mirror/releases/download/220101-5284ceeb/
+    path: /asset-mirror/releases/download/220308-5284ceeb/
     files:
     - amd_ucode.img
     - desktopfs.sfs
@@ -1557,9 +1549,9 @@ endpoints:
     - vmlinuz
     os: garuda
     flavor: dr460nized-gaming
-    version: 220101
+    version: 220308
   garuda-dr460nized:
-    path: /asset-mirror/releases/download/220131-b3db1968/
+    path: /asset-mirror/releases/download/220308-b3db1968/
     files:
     - amd_ucode.img
     - desktopfs.sfs
@@ -1571,9 +1563,9 @@ endpoints:
     - vmlinuz
     os: garuda
     flavor: dr460nized
-    version: 220131
+    version: 220308
   garuda-dr460nized-blackarch:
-    path: /asset-mirror/releases/download/220131-6ab56054/
+    path: /asset-mirror/releases/download/220308-6ab56054/
     files:
     - amd_ucode.img
     - desktopfs.sfs
@@ -1585,9 +1577,9 @@ endpoints:
     - vmlinuz
     os: garuda
     flavor: dr460nized-blackarch
-    version: 220131
+    version: 220308
   garuda-xfce:
-    path: /asset-mirror/releases/download/220131-fdf20131/
+    path: /asset-mirror/releases/download/220308-fdf20131/
     files:
     - amd_ucode.img
     - desktopfs.sfs
@@ -1599,9 +1591,9 @@ endpoints:
     - vmlinuz
     os: garuda
     flavor: xfce
-    version: 220131
+    version: 220308
   garuda-gnome:
-    path: /asset-mirror/releases/download/220131-f04b5cbd/
+    path: /asset-mirror/releases/download/220308-f04b5cbd/
     files:
     - amd_ucode.img
     - desktopfs.sfs
@@ -1613,9 +1605,9 @@ endpoints:
     - vmlinuz
     os: garuda
     flavor: gnome
-    version: 220131
+    version: 220308
   garuda-lxqt-kwin:
-    path: /asset-mirror/releases/download/220131-291ae047/
+    path: /asset-mirror/releases/download/220308-291ae047/
     files:
     - amd_ucode.img
     - desktopfs.sfs
@@ -1627,9 +1619,9 @@ endpoints:
     - vmlinuz
     os: garuda
     flavor: lxqt-kwin
-    version: 220131
+    version: 220308
   garuda-wayfire:
-    path: /asset-mirror/releases/download/220101-99063bd3/
+    path: /asset-mirror/releases/download/220308-99063bd3/
     files:
     - amd_ucode.img
     - desktopfs.sfs
@@ -1641,9 +1633,9 @@ endpoints:
     - vmlinuz
     os: garuda
     flavor: wayfire
-    version: 220101
+    version: 220308
   garuda-qtile:
-    path: /asset-mirror/releases/download/220131-7445d99d/
+    path: /asset-mirror/releases/download/220308-7445d99d/
     files:
     - amd_ucode.img
     - desktopfs.sfs
@@ -1655,9 +1647,9 @@ endpoints:
     - vmlinuz
     os: garuda
     flavor: qtile
-    version: 220131
+    version: 220308
   garuda-i3wm:
-    path: /asset-mirror/releases/download/220131-95710e33/
+    path: /asset-mirror/releases/download/220308-95710e33/
     files:
     - amd_ucode.img
     - desktopfs.sfs
@@ -1669,9 +1661,9 @@ endpoints:
     - vmlinuz
     os: garuda
     flavor: i3wm
-    version: 220131
+    version: 220308
   garuda-sway:
-    path: /asset-mirror/releases/download/220131-c5aad419/
+    path: /asset-mirror/releases/download/220308-c5aad419/
     files:
     - amd_ucode.img
     - desktopfs.sfs
@@ -1683,9 +1675,9 @@ endpoints:
     - vmlinuz
     os: garuda
     flavor: sway
-    version: 220131
+    version: 220308
   garuda-mate:
-    path: /asset-mirror/releases/download/220131-ba2d234f/
+    path: /asset-mirror/releases/download/220308-ba2d234f/
     files:
     - amd_ucode.img
     - desktopfs.sfs
@@ -1697,9 +1689,9 @@ endpoints:
     - vmlinuz
     os: garuda
     flavor: mate
-    version: 220131
+    version: 220308
   garuda-kde-barebones:
-    path: /asset-mirror/releases/download/220131-198784ed/
+    path: /asset-mirror/releases/download/220308-198784ed/
     files:
     - amd_ucode.img
     - desktopfs.sfs
@@ -1711,7 +1703,7 @@ endpoints:
     - vmlinuz
     os: garuda
     flavor: kde-barebones
-    version: 220131
+    version: 220308
   ubuntu-21.10-KDE-squash:
     path: /ubuntu-squash/releases/download/21.10-0e47f5b7/
     files:
@@ -1873,3 +1865,27 @@ endpoints:
     version: '21.10'
     flavor: intel-amd
     kernel: pop-21.10-default-squash
+  proxmox-backup-server:
+    path: /asset-mirror/releases/download/2.1-1-7dc21774/
+    files:
+    - initrd
+    - proxmox-backup-server.iso
+    - vmlinuz
+    os: proxmox-backup-server
+    version: 2.1-1
+  proxmox-ve:
+    path: /asset-mirror/releases/download/7.1-2-a42c4ce8/
+    files:
+    - initrd
+    - proxmox.iso
+    - vmlinuz
+    os: proxmox-ve
+    version: 7.1-2
+  proxmox-mailgateway:
+    path: /asset-mirror/releases/download/7.1-1-e466f982/
+    files:
+    - initrd
+    - proxmox-mailgateway.iso
+    - vmlinuz
+    os: proxmox-mailgateway
+    version: 7.1-1

roles/netbootxyz/defaults/main.yml

@@ -149,8 +149,8 @@ releases:
     mirror: mirrors.kernel.org
     name: Arch Linux
     versions:
-    - code_name: 2022.02.01
-      name: 2022.02.01
+    - code_name: 2022.03.01
+      name: 2022.03.01
   blackarch:
     enabled: true
     menu: linux
@@ -182,11 +182,11 @@ releases:
     mirror: https://builds.coreos.fedoraproject.org
     name: Fedora CoreOS
     versions:
-    - code_name: 35.20220131.3.0
+    - code_name: 35.20220227.3.0
       name: stable
-    - code_name: 35.20220213.2.0
+    - code_name: 35.20220313.2.0
       name: testing
-    - code_name: 35.20220213.1.0
+    - code_name: 35.20220313.1.0
       name: next
   debian:
     archive_mirror: http://archive.debian.org
@@ -284,8 +284,8 @@ releases:
     mirror: https://downloads.ipfire.org
     name: IPFire
     versions:
-    - code_name: 2.27-core163
-      name: 2.27 Core163
+    - code_name: 2.27-core164
+      name: 2.27 Core164
   k3os:
     enabled: true
     menu: linux
@@ -389,7 +389,7 @@ releases:
   proxmox:
     enabled: true
     menu: linux
-    name: Proxmox VE
+    name: Proxmox
   rancheros:
     base_dir: os/latest
     enabled: true
@@ -451,14 +451,14 @@ releases:
     mirror: https://netboot.joyent.com/os/
     name: SmartOS
     versions:
+    - code_name: 20220310T212952Z
+      name: 20220310T212952Z
+    - code_name: 20220310T004022Z
+      name: 20220310T004022Z
     - code_name: 20220224T192409Z
       name: 20220224T192409Z
     - code_name: 20220224T005328Z
       name: 20220224T005328Z
-    - code_name: 20220210T011229Z
-      name: 20220210T011229Z
-    - code_name: 20220127T011500Z
-      name: 20220127T011500Z
   talos:
     enabled: true
     menu: linux

roles/netbootxyz/tasks/generate_disks.yml

@@ -1,29 +1,29 @@
 ---
 
-  - include: generate_disks_base.yml
+  - include_tasks: generate_disks_base.yml
 
-  - include: generate_disks_legacy.yml
+  - include_tasks: generate_disks_legacy.yml
     when:
     - generate_disks_legacy | default(true) | bool
 
-  - include: generate_disks_linux.yml
+  - include_tasks: generate_disks_linux.yml
     when:
     - generate_disks_linux | default(false) | bool
 
-  - include: generate_disks_efi.yml
+  - include_tasks: generate_disks_efi.yml
     when:
     - generate_disks_efi | default(true) | bool
 
-  - include: generate_disks_arm.yml
+  - include_tasks: generate_disks_arm.yml
     when:
     - generate_disks_arm | default(false) | bool
 
-  - include: generate_disks_rpi.yml
+  - include_tasks: generate_disks_rpi.yml
     when:
     - generate_disks_rpi | default(false) | bool
     - bootloader_filename == "netboot.xyz"
 
-  - include: generate_disks_hybrid.yml
+  - include_tasks: generate_disks_hybrid.yml
     when:
     - generate_disks_hybrid | default(false) | bool
     - generate_disks_legacy | default(true) | bool

roles/netbootxyz/tasks/main.yml

@@ -1,13 +1,13 @@
 ---
-  - include: generate_menus.yml
+  - include_tasks: generate_menus.yml
     when:
     - generate_menus | default(true) | bool
 
-  - include: generate_menus_custom.yml
+  - include_tasks: generate_menus_custom.yml
     when:
     - custom_generate_menus | default(false) | bool
 
-  - include: generate_disks.yml
+  - include_tasks: generate_disks.yml
     with_items:
     - "{{ bootloader_disks }}"
     loop_control:
@@ -15,10 +15,10 @@
     when:
     - generate_disks | default(true) | bool
 
-  - include: generate_checksums.yml
+  - include_tasks: generate_checksums.yml
     when:
     - generate_checksums | default(true) | bool
 
-  - include: generate_signatures.yml
+  - include_tasks: generate_signatures.yml
     when:
     - generate_signatures | default(false) | bool

roles/netbootxyz/templates/menu/proxmox.ipxe.j2

@@ -1,42 +1,96 @@
 #!ipxe
 
-# Proxmox VE
+# Proxmox Open Source Products
 # https://www.proxmox.com
 
 goto ${menu} ||
 
 :proxmox
+clear proxmox_choice
 clear proxmox_version
-set os Proxmox VE
+set os Proxmox
 menu ${os}
-item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
-{% if value.os == "proxmox" %}
-item normal ${space} ${os} {{ value.version }}
-item debug ${space} ${os} {{ value.version }} (Debug)
+{% if value.os == "proxmox-backup-server" %}
+item --gap ${os} Backup Server
+item pbs-normal ${space} ${os} Backup Server {{ value.version }}
+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-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-debug ${space} ${os} VE {{ value.version }} (Debug)
 {% endif %}
 {% endfor %}
-choose proxmox_version || goto proxmox_exit
-goto ${proxmox_version}
+choose proxmox_choice || goto proxmox_exit
+goto ${proxmox_choice}
+
+:pve-normal
+set params splash=silent
+goto boot-pve
+
+:pve-debug
+set params splash=verbose proxdebug
+goto boot-pve
+
+:pmg-normal
+set params splash=silent
+goto boot-pmg
+
+:pmg-debug
+set params splash=verbose proxdebug
+goto boot-pmg
 
-:normal
+:pbs-normal
 set params splash=silent
-goto boot
+goto boot-pbs
 
-:debug
+:pbs-debug
 set params splash=verbose proxdebug
-goto boot
+goto boot-pbs
+
+:boot-pbs
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "proxmox-backup-server" %}
+set kernel_url ${live_endpoint}{{ value.path }}
+set proxmox_version {{ value.version }}
+{% endif %}
+{% endfor %}
+imgfree
+kernel ${kernel_url}vmlinuz vga=791 video=vesafb:ywrap,mtrr ramdisk_size=16777216 rw quiet ${params} {{ kernel_params }}
+initrd ${kernel_url}initrd
+initrd http://download.proxmox.com/iso/proxmox-backup-server_${proxmox_version}.iso /proxmox.iso
+boot
+
+:boot-pmg
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "proxmox-mailgateway" %}
+set kernel_url ${live_endpoint}{{ value.path }}
+set proxmox_version {{ value.version }}
+{% endif %}
+{% endfor %}
+imgfree
+kernel ${kernel_url}vmlinuz vga=791 video=vesafb:ywrap,mtrr ramdisk_size=16777216 rw quiet ${params} {{ kernel_params }}
+initrd ${kernel_url}initrd
+initrd http://download.proxmox.com/iso/proxmox-mailgateway_${proxmox_version}.iso /proxmox.iso
+boot
 
-:boot
+:boot-pve
 {% for key, value in endpoints.items() | sort %}
-{% if value.os == "proxmox" %}
+{% if value.os == "proxmox-ve" %}
 set kernel_url ${live_endpoint}{{ value.path }}
+set proxmox_version {{ value.version }}
 {% endif %}
 {% endfor %}
 imgfree
 kernel ${kernel_url}vmlinuz vga=791 video=vesafb:ywrap,mtrr ramdisk_size=16777216 rw quiet ${params} {{ kernel_params }}
 initrd ${kernel_url}initrd
-initrd ${kernel_url}proxmox.iso /proxmox.iso
+initrd http://download.proxmox.com/iso/proxmox-ve_${proxmox_version}.iso /proxmox.iso
 boot
 
 :proxmox_exit

version.txt

@@ -1 +1 @@
-2.0.56
+2.0.57