Skip to content

Commit 1152d87

Browse files
authored
Merge pull request #4202 from AkihiroSuda/ubuntu-25.10
templates: update Ubuntu to 25.10
2 parents 3819d5b + 16cf751 commit 1152d87

File tree

7 files changed

+53
-27
lines changed

7 files changed

+53
-27
lines changed

hack/test-templates.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,6 @@ limactl shell "$NAME" bash -c "echo 'foo \"bar\"'"
316316

317317
if [[ -n ${CHECKS["systemd"]} ]]; then
318318
set -x
319-
# agetty segfaults on Ubuntu 25.04 (x86_64)
320-
# > __strncmp_evex () at ../sysdeps/x86_64/multiarch/strcmp-evex.S:316
321-
# Should be fixed in Ubuntu 25.10 with util-linux >= 2.41
322-
# https://github.com/lima-vm/lima/pull/3643#issuecomment-3006788732
323-
if limactl shell "$NAME" systemctl -q is-failed [email protected]; then
324-
limactl shell "$NAME" sudo systemctl reset-failed [email protected]
325-
fi
326319
if ! limactl shell "$NAME" systemctl is-system-running --wait; then
327320
ERROR '"systemctl is-system-running" failed'
328321
diagnose "$NAME"
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
images:
2+
# Try to use release-yyyyMMdd image if available. Note that release-yyyyMMdd will be removed after several months.
3+
4+
- location: "https://cloud-images.ubuntu.com/releases/questing/release-20251007/ubuntu-25.10-server-cloudimg-amd64.img"
5+
arch: "x86_64"
6+
digest: "sha256:67825fe057c20aede30d86be90f876b4b687a3c7f7a7a409c68c0c1352760a55"
7+
- location: "https://cloud-images.ubuntu.com/releases/questing/release-20251007/ubuntu-25.10-server-cloudimg-arm64.img"
8+
arch: "aarch64"
9+
digest: "sha256:a7b84e640e4dd1f1de036653fbdc18dc0600b5293e89c0958fc7de507c550cca"
10+
- location: "https://cloud-images.ubuntu.com/releases/questing/release-20251007/ubuntu-25.10-server-cloudimg-riscv64.img"
11+
arch: "riscv64"
12+
digest: "sha256:58a16255fa68b952da5d0c9a6f717bb5b48a92b228b97388daa8ca7344979ed6"
13+
- location: "https://cloud-images.ubuntu.com/releases/questing/release-20251007/ubuntu-25.10-server-cloudimg-armhf.img"
14+
arch: "armv7l"
15+
digest: "sha256:f1b7f8a2671716e1204df3868eedd41a0c4ea8afa71871868dff8260a618ca5a"
16+
- location: "https://cloud-images.ubuntu.com/releases/questing/release-20251007/ubuntu-25.10-server-cloudimg-s390x.img"
17+
arch: "s390x"
18+
digest: "sha256:0092a721e20f26211dcd49e814d164dba1a75405c4f97bf31bdd3de6d205ed64"
19+
- location: "https://cloud-images.ubuntu.com/releases/questing/release-20251007/ubuntu-25.10-server-cloudimg-ppc64el.img"
20+
arch: "ppc64le"
21+
digest: "sha256:c57e9a03fe20c9ec2eb2a909cb02945530c5d47ace5c436b0cff65665e62f2c6"
22+
# Fallback to the latest release image.
23+
# Hint: run `limactl prune` to invalidate the cache
24+
25+
- location: https://cloud-images.ubuntu.com/releases/questing/release/ubuntu-25.10-server-cloudimg-amd64.img
26+
arch: x86_64
27+
28+
- location: https://cloud-images.ubuntu.com/releases/questing/release/ubuntu-25.10-server-cloudimg-arm64.img
29+
arch: aarch64
30+
31+
- location: https://cloud-images.ubuntu.com/releases/questing/release/ubuntu-25.10-server-cloudimg-riscv64.img
32+
arch: riscv64
33+
34+
- location: https://cloud-images.ubuntu.com/releases/questing/release/ubuntu-25.10-server-cloudimg-armhf.img
35+
arch: armv7l
36+
37+
- location: https://cloud-images.ubuntu.com/releases/questing/release/ubuntu-25.10-server-cloudimg-s390x.img
38+
arch: s390x
39+
40+
- location: https://cloud-images.ubuntu.com/releases/questing/release/ubuntu-25.10-server-cloudimg-ppc64el.img
41+
arch: ppc64le
42+
43+
# # NOTE: Intel Mac with macOS prior to 15.5 requires setting vmType to qemu
44+
# # https://github.com/lima-vm/lima/issues/3334
45+
# vmType: qemu

templates/_images/ubuntu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ubuntu-25.04.yaml
1+
ubuntu-25.10.yaml

templates/experimental/ubuntu-25.10.yaml

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ubuntu-25.10.yaml
1+
../ubuntu-25.10.yaml

templates/ubuntu-25.10.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
minimumLimaVersion: 1.1.0
2+
3+
base:
4+
- template://_images/ubuntu-25.10
5+
- template://_default/mounts

templates/ubuntu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ubuntu-25.04.yaml
1+
ubuntu-25.10.yaml

0 commit comments

Comments
 (0)