diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c3670fd353e..bc77b2f3c91 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -305,11 +305,9 @@ jobs: matrix: # Most templates use 9p as the mount type template: - - ubuntu-25.04.yaml # The default version of Ubuntu is still 24.10 due to https://github.com/lima-vm/lima/issues/3334 - alpine.yaml - debian.yaml # reverse-sshfs - - fedora.yaml # The default version of Fedora is still 41 due to https://github.com/lima-vm/lima/issues/3334 - - fedora-42.yaml + - fedora.yaml - archlinux.yaml - opensuse.yaml - docker.yaml diff --git a/hack/test-templates.sh b/hack/test-templates.sh index 9bba8ba3785..2935907c99e 100755 --- a/hack/test-templates.sh +++ b/hack/test-templates.sh @@ -252,6 +252,13 @@ limactl shell "$NAME" bash -c "echo 'foo \"bar\"'" if [[ -n ${CHECKS["systemd"]} ]]; then set -x + # agetty segfaults on Ubuntu 25.04 (x86_64) + # > __strncmp_evex () at ../sysdeps/x86_64/multiarch/strcmp-evex.S:316 + # Should be fixed in Ubuntu 25.10 with util-linux >= 2.41 + # https://github.com/lima-vm/lima/pull/3643#issuecomment-3006788732 + if limactl shell "$NAME" systemctl -q is-failed serial-getty@ttyS0.service; then + limactl shell "$NAME" sudo systemctl reset-failed serial-getty@ttyS0.service + fi if ! limactl shell "$NAME" systemctl is-system-running --wait; then ERROR '"systemctl is-system-running" failed' diagnose "$NAME" diff --git a/pkg/limayaml/defaults.go b/pkg/limayaml/defaults.go index a2193a28389..d9d2c6229d3 100644 --- a/pkg/limayaml/defaults.go +++ b/pkg/limayaml/defaults.go @@ -699,6 +699,12 @@ func FillDefault(y, d, o *LimaYAML, filePath string, warn bool) { for _, f := range y.MountTypesUnsupported { mountTypesUnsupported[f] = struct{}{} } + + if runtime.GOOS == "windows" { + // QEMU for Windows does not support 9p + mountTypesUnsupported[NINEP] = struct{}{} + } + // MountType has to be resolved before resolving Mounts if y.MountType == nil { y.MountType = d.MountType diff --git a/templates/README.md b/templates/README.md index ace299c54ff..f6fe4c65fbf 100644 --- a/templates/README.md +++ b/templates/README.md @@ -22,8 +22,8 @@ Distro: - [`centos-stream-10`](./centos-stream-10.yaml): CentOS Stream 10 - [`debian-11`](./debian-11.yaml): Debian GNU/Linux 11(bullseye) - [`debian-12`](./debian-12.yaml), `debian.yaml`: ⭐Debian GNU/Linux 12(bookworm) -- [`fedora-41`](./fedora-41.yaml), `fedora.yaml`: ⭐Fedora 41 -- [`fedora-42`](./fedora-42.yaml): Fedora 42 +- [`fedora-41`](./fedora-41.yaml): Fedora 41 +- [`fedora-42`](./fedora-42.yaml), `fedora.yaml`: ⭐Fedora 42 - [`opensuse-leap`](./opensuse-leap.yaml), `opensuse.yaml`: ⭐openSUSE Leap - [`oraclelinux-8`](./oraclelinux-8.yaml): Oracle Linux 8 - [`oraclelinux-9`](./oraclelinux-9.yaml), `oraclelinux.yaml`: Oracle Linux 9 diff --git a/templates/_images/fedora.yaml b/templates/_images/fedora.yaml index 98dcf55f942..660722ae4b6 120000 --- a/templates/_images/fedora.yaml +++ b/templates/_images/fedora.yaml @@ -1 +1 @@ -fedora-41.yaml \ No newline at end of file +fedora-42.yaml \ No newline at end of file diff --git a/templates/_images/ubuntu.yaml b/templates/_images/ubuntu.yaml index 9e033b6dd81..3475af5cbe5 120000 --- a/templates/_images/ubuntu.yaml +++ b/templates/_images/ubuntu.yaml @@ -1 +1 @@ -ubuntu-24.10.yaml \ No newline at end of file +ubuntu-25.04.yaml \ No newline at end of file diff --git a/templates/default.yaml b/templates/default.yaml index 99f01eccdf0..11a88640239 100644 --- a/templates/default.yaml +++ b/templates/default.yaml @@ -91,13 +91,11 @@ mounts: [] # The issue was fixed in Linux v6.12-rc5 (https://github.com/torvalds/linux/commit/be2ca38). # # 🟢 Builtin default: [] -# 🔵 This file: ["9p"] (as Ubuntu 24.10 uses kernel 6.11) -mountTypesUnsupported: -- "9p" +mountTypesUnsupported: null # Mount type for above mounts, such as "reverse-sshfs" (from sshocker), "9p" (QEMU’s virtio-9p-pci, aka virtfs), # or "virtiofs" (experimental on Linux; needs `vmType: vz` on macOS). -# 🟢 Builtin default: "default" (resolved to be "9p" for QEMU since Lima v1.0, "virtiofs" for vz) +# 🟢 Builtin default: "default" (resolved to be "9p" for QEMU since Lima v1.0 on non-Windows, "virtiofs" for vz) mountType: null # Enable inotify support for mounted directories (EXPERIMENTAL) diff --git a/templates/fedora.yaml b/templates/fedora.yaml index 98dcf55f942..660722ae4b6 120000 --- a/templates/fedora.yaml +++ b/templates/fedora.yaml @@ -1 +1 @@ -fedora-41.yaml \ No newline at end of file +fedora-42.yaml \ No newline at end of file diff --git a/templates/podman-rootful.yaml b/templates/podman-rootful.yaml index c0dcebe937a..ba85ce09cd2 100644 --- a/templates/podman-rootful.yaml +++ b/templates/podman-rootful.yaml @@ -13,7 +13,7 @@ minimumLimaVersion: 1.1.0 base: -- template://_images/fedora-41 +- template://_images/fedora - template://_default/mounts containerd: diff --git a/templates/podman.yaml b/templates/podman.yaml index e50cf370203..968a4646248 100644 --- a/templates/podman.yaml +++ b/templates/podman.yaml @@ -13,7 +13,7 @@ minimumLimaVersion: 1.1.0 base: -- template://_images/fedora-41 +- template://_images/fedora - template://_default/mounts containerd: diff --git a/templates/ubuntu.yaml b/templates/ubuntu.yaml index 9e033b6dd81..3475af5cbe5 120000 --- a/templates/ubuntu.yaml +++ b/templates/ubuntu.yaml @@ -1 +1 @@ -ubuntu-24.10.yaml \ No newline at end of file +ubuntu-25.04.yaml \ No newline at end of file diff --git a/website/content/en/docs/config/mount.md b/website/content/en/docs/config/mount.md index dd76e6e5695..4478db26f41 100644 --- a/website/content/en/docs/config/mount.md +++ b/website/content/en/docs/config/mount.md @@ -12,7 +12,7 @@ The default mount type is shown in the following table: | < 0.10 | reverse-sshfs + Builtin SFTP server | | >= 0.10 | reverse-sshfs + OpenSSH SFTP server | | >= 0.17 | reverse-sshfs + OpenSSH SFTP server for QEMU, virtiofs for VZ | -| >= 1.0 | 9p for QEMU, virtiofs for VZ | +| >= 1.0 | 9p for QEMU (on non-Windows), virtiofs for VZ | ## Mount types