Skip to content

Commit d383302

Browse files
committed
Offer Ubuntu 26.04 LTS in the VM OS picker
26.04 is the current LTS. Added to the pickers that take any Debian or Ubuntu base; the cloud image exists for amd64 and arm64, and Docker's apt repository carries a resolute dist, so get.docker.com resolves. unifi-os-server-vm and waydroid-vm are left alone: the UniFi installer ships its own OS matrix and Waydroid depends on kernel modules, and neither is verified on 26.04.
1 parent 3df6130 commit d383302

3 files changed

Lines changed: 27 additions & 6 deletions

File tree

‎vm/docker-vm.sh‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ function select_os() {
4949
if [[ "${VM_UNATTENDED:-0}" == "1" ]]; then
5050
OS_CHOICE="${VM_OS_VERSION:-debian13}"
5151
elif ! OS_CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SELECT OS" --radiolist \
52-
"Choose Operating System for Docker VM" 14 68 4 \
52+
"Choose Operating System for Docker VM" 15 68 5 \
5353
"debian13" "Debian 13 (Trixie) - Latest" ON \
5454
"debian12" "Debian 12 (Bookworm) - Stable" OFF \
55+
"ubuntu2604" "Ubuntu 26.04 LTS (Resolute)" OFF \
5556
"ubuntu2404" "Ubuntu 24.04 LTS (Noble)" OFF \
5657
"ubuntu2204" "Ubuntu 22.04 LTS (Jammy)" OFF \
5758
3>&1 1>&2 2>&3); then
@@ -71,6 +72,12 @@ function select_os() {
7172
OS_CODENAME="bookworm"
7273
OS_DISPLAY="Debian 12 (Bookworm)"
7374
;;
75+
ubuntu2604)
76+
OS_TYPE="ubuntu"
77+
OS_VERSION="26.04"
78+
OS_CODENAME="resolute"
79+
OS_DISPLAY="Ubuntu 26.04 LTS"
80+
;;
7481
ubuntu2404)
7582
OS_TYPE="ubuntu"
7683
OS_VERSION="24.04"
@@ -84,7 +91,7 @@ function select_os() {
8491
OS_DISPLAY="Ubuntu 22.04 LTS"
8592
;;
8693
*)
87-
msg_error "Unsupported OS '${OS_CHOICE}' (expected debian13, debian12, ubuntu2404 or ubuntu2204)"
94+
msg_error "Unsupported OS '${OS_CHOICE}' (expected debian13, debian12, ubuntu2604, ubuntu2404 or ubuntu2204)"
8895
exit 1
8996
;;
9097
esac

‎vm/k3s-vm.sh‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,10 @@ function select_os() {
5656
if [[ "${VM_UNATTENDED:-0}" == "1" ]]; then
5757
OS_CHOICE="${VM_OS_VERSION:-debian13}"
5858
elif ! OS_CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SELECT OS" --radiolist \
59-
"Choose Operating System for K3s VM" 14 68 4 \
59+
"Choose Operating System for K3s VM" 15 68 5 \
6060
"debian13" "Debian 13 (Trixie) - Latest" ON \
6161
"debian12" "Debian 12 (Bookworm) - Stable" OFF \
62+
"ubuntu2604" "Ubuntu 26.04 LTS (Resolute)" OFF \
6263
"ubuntu2404" "Ubuntu 24.04 LTS (Noble)" OFF \
6364
"ubuntu2204" "Ubuntu 22.04 LTS (Jammy)" OFF \
6465
3>&1 1>&2 2>&3); then
@@ -78,6 +79,12 @@ function select_os() {
7879
OS_CODENAME="bookworm"
7980
OS_DISPLAY="Debian 12 (Bookworm)"
8081
;;
82+
ubuntu2604)
83+
OS_TYPE="ubuntu"
84+
OS_VERSION="26.04"
85+
OS_CODENAME="resolute"
86+
OS_DISPLAY="Ubuntu 26.04 LTS"
87+
;;
8188
ubuntu2404)
8289
OS_TYPE="ubuntu"
8390
OS_VERSION="24.04"
@@ -91,7 +98,7 @@ function select_os() {
9198
OS_DISPLAY="Ubuntu 22.04 LTS"
9299
;;
93100
*)
94-
msg_error "Unsupported OS '${OS_CHOICE}' (expected debian13, debian12, ubuntu2404 or ubuntu2204)"
101+
msg_error "Unsupported OS '${OS_CHOICE}' (expected debian13, debian12, ubuntu2604, ubuntu2404 or ubuntu2204)"
95102
exit 1
96103
;;
97104
esac

‎vm/netbird-server.sh‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,10 @@ function select_os() {
127127
if [[ "${VM_UNATTENDED:-0}" == "1" ]]; then
128128
OS_CHOICE="${VM_OS_VERSION:-debian13}"
129129
elif ! OS_CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SELECT OS" --radiolist \
130-
"Choose Operating System for NetBird Server VM" 14 68 3 \
130+
"Choose Operating System for NetBird Server VM" 15 68 4 \
131131
"debian13" "Debian 13 (Trixie) - Latest" ON \
132132
"debian12" "Debian 12 (Bookworm) - Stable" OFF \
133+
"ubuntu2604" "Ubuntu 26.04 LTS (Resolute)" OFF \
133134
"ubuntu2404" "Ubuntu 24.04 LTS (Noble)" OFF \
134135
3>&1 1>&2 2>&3); then
135136
exit_script
@@ -148,14 +149,20 @@ function select_os() {
148149
OS_CODENAME="bookworm"
149150
OS_DISPLAY="Debian 12 (Bookworm)"
150151
;;
152+
ubuntu2604)
153+
OS_TYPE="ubuntu"
154+
OS_VERSION="26.04"
155+
OS_CODENAME="resolute"
156+
OS_DISPLAY="Ubuntu 26.04 LTS"
157+
;;
151158
ubuntu2404)
152159
OS_TYPE="ubuntu"
153160
OS_VERSION="24.04"
154161
OS_CODENAME="noble"
155162
OS_DISPLAY="Ubuntu 24.04 LTS"
156163
;;
157164
*)
158-
msg_error "Unsupported OS '${OS_CHOICE}' (expected debian13, debian12 or ubuntu2404)"
165+
msg_error "Unsupported OS '${OS_CHOICE}' (expected debian13, debian12, ubuntu2604 or ubuntu2404)"
159166
exit 1
160167
;;
161168
esac

0 commit comments

Comments
 (0)