Skip to content

Commit 0098f15

Browse files
authored
Merge pull request #3643 from AkihiroSuda/ubuntu-25.04
templates: default: use Ubuntu 25.04, Fedora 42
2 parents 1abadcd + 9f2b750 commit 0098f15

File tree

12 files changed

+25
-16
lines changed

12 files changed

+25
-16
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,9 @@ jobs:
305305
matrix:
306306
# Most templates use 9p as the mount type
307307
template:
308-
- ubuntu-25.04.yaml # The default version of Ubuntu is still 24.10 due to https://github.com/lima-vm/lima/issues/3334
309308
- alpine.yaml
310309
- debian.yaml # reverse-sshfs
311-
- fedora.yaml # The default version of Fedora is still 41 due to https://github.com/lima-vm/lima/issues/3334
312-
- fedora-42.yaml
310+
- fedora.yaml
313311
- archlinux.yaml
314312
- opensuse.yaml
315313
- docker.yaml

hack/test-templates.sh

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

253253
if [[ -n ${CHECKS["systemd"]} ]]; then
254254
set -x
255+
# agetty segfaults on Ubuntu 25.04 (x86_64)
256+
# > __strncmp_evex () at ../sysdeps/x86_64/multiarch/strcmp-evex.S:316
257+
# Should be fixed in Ubuntu 25.10 with util-linux >= 2.41
258+
# https://github.com/lima-vm/lima/pull/3643#issuecomment-3006788732
259+
if limactl shell "$NAME" systemctl -q is-failed [email protected]; then
260+
limactl shell "$NAME" sudo systemctl reset-failed [email protected]
261+
fi
255262
if ! limactl shell "$NAME" systemctl is-system-running --wait; then
256263
ERROR '"systemctl is-system-running" failed'
257264
diagnose "$NAME"

pkg/limayaml/defaults.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,12 @@ func FillDefault(y, d, o *LimaYAML, filePath string, warn bool) {
699699
for _, f := range y.MountTypesUnsupported {
700700
mountTypesUnsupported[f] = struct{}{}
701701
}
702+
703+
if runtime.GOOS == "windows" {
704+
// QEMU for Windows does not support 9p
705+
mountTypesUnsupported[NINEP] = struct{}{}
706+
}
707+
702708
// MountType has to be resolved before resolving Mounts
703709
if y.MountType == nil {
704710
y.MountType = d.MountType

templates/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Distro:
2222
- [`centos-stream-10`](./centos-stream-10.yaml): CentOS Stream 10
2323
- [`debian-11`](./debian-11.yaml): Debian GNU/Linux 11(bullseye)
2424
- [`debian-12`](./debian-12.yaml), `debian.yaml`: ⭐Debian GNU/Linux 12(bookworm)
25-
- [`fedora-41`](./fedora-41.yaml), `fedora.yaml`: ⭐Fedora 41
26-
- [`fedora-42`](./fedora-42.yaml): Fedora 42
25+
- [`fedora-41`](./fedora-41.yaml): Fedora 41
26+
- [`fedora-42`](./fedora-42.yaml), `fedora.yaml`: ⭐Fedora 42
2727
- [`opensuse-leap`](./opensuse-leap.yaml), `opensuse.yaml`: ⭐openSUSE Leap
2828
- [`oraclelinux-8`](./oraclelinux-8.yaml): Oracle Linux 8
2929
- [`oraclelinux-9`](./oraclelinux-9.yaml), `oraclelinux.yaml`: Oracle Linux 9

templates/_images/fedora.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fedora-41.yaml
1+
fedora-42.yaml

templates/_images/ubuntu.yaml

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

templates/default.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,11 @@ mounts: []
9191
# The issue was fixed in Linux v6.12-rc5 (https://github.com/torvalds/linux/commit/be2ca38).
9292
#
9393
# 🟢 Builtin default: []
94-
# 🔵 This file: ["9p"] (as Ubuntu 24.10 uses kernel 6.11)
95-
mountTypesUnsupported:
96-
- "9p"
94+
mountTypesUnsupported: null
9795

9896
# Mount type for above mounts, such as "reverse-sshfs" (from sshocker), "9p" (QEMU’s virtio-9p-pci, aka virtfs),
9997
# or "virtiofs" (experimental on Linux; needs `vmType: vz` on macOS).
100-
# 🟢 Builtin default: "default" (resolved to be "9p" for QEMU since Lima v1.0, "virtiofs" for vz)
98+
# 🟢 Builtin default: "default" (resolved to be "9p" for QEMU since Lima v1.0 on non-Windows, "virtiofs" for vz)
10199
mountType: null
102100

103101
# Enable inotify support for mounted directories (EXPERIMENTAL)

templates/fedora.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fedora-41.yaml
1+
fedora-42.yaml

templates/podman-rootful.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
minimumLimaVersion: 1.1.0
1414

1515
base:
16-
- template://_images/fedora-41
16+
- template://_images/fedora
1717
- template://_default/mounts
1818

1919
containerd:

templates/podman.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
minimumLimaVersion: 1.1.0
1414

1515
base:
16-
- template://_images/fedora-41
16+
- template://_images/fedora
1717
- template://_default/mounts
1818

1919
containerd:

templates/ubuntu.yaml

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

website/content/en/docs/config/mount.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The default mount type is shown in the following table:
1212
| < 0.10 | reverse-sshfs + Builtin SFTP server |
1313
| >= 0.10 | reverse-sshfs + OpenSSH SFTP server |
1414
| >= 0.17 | reverse-sshfs + OpenSSH SFTP server for QEMU, virtiofs for VZ |
15-
| >= 1.0 | 9p for QEMU, virtiofs for VZ |
15+
| >= 1.0 | 9p for QEMU (on non-Windows), virtiofs for VZ |
1616

1717
## Mount types
1818

0 commit comments

Comments
 (0)