Skip to content

Commit

Permalink
templates: disable 9p for Linux 6.9-6.11
Browse files Browse the repository at this point in the history
9p is broken in Linux v6.9, v6.10, and v6.11 (see issue 2701 and PR 2821).

The issue was fixed in Linux v6.12-rc5 (torvalds/linux@be2ca38).

Signed-off-by: Akihiro Suda <[email protected]>
  • Loading branch information
AkihiroSuda committed Oct 30, 2024
1 parent a53e059 commit bf9f537
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 3 deletions.
5 changes: 3 additions & 2 deletions pkg/limayaml/limayaml_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ func TestDefaultYAML(t *testing.T) {
var y LimaYAML
err = Unmarshal(bytes, &y, "")
assert.NilError(t, err)
y.Images = nil // remove default images
y.Mounts = nil // remove default mounts
y.Images = nil // remove default images
y.Mounts = nil // remove default mounts
y.MountTypesUnsupported = nil // remove default workaround for kernel 6.9-6.11
t.Log(dumpJSON(t, y))
b, err := Marshal(&y, false)
assert.NilError(t, err)
Expand Down
4 changes: 4 additions & 0 deletions templates/archlinux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ mounts:
- location: "~"
- location: "/tmp/lima"
writable: true

# 9p is broken in Linux v6.9, v6.10, and v6.11.
# The issue was fixed in Linux v6.12-rc5 (https://github.com/torvalds/linux/commit/be2ca38).
mountTypesUnsupported: ["9p"]
7 changes: 6 additions & 1 deletion templates/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,14 @@ mounts:

# List of mount types not supported by the kernel of this distro.
# Also used to resolve the default mount type when not explicitly specified.
#
# NOTE: 9p is broken in Linux v6.9, v6.10, and v6.11.
# 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"
- "9p"

# 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).
Expand Down
4 changes: 4 additions & 0 deletions templates/fedora.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ mounts:
- location: "~"
- location: "/tmp/lima"
writable: true

# 9p is broken in Linux v6.9, v6.10, and v6.11 (used by Fedora 41).
# The issue was fixed in Linux v6.12-rc5 (https://github.com/torvalds/linux/commit/be2ca38).
mountTypesUnsupported: ["9p"]
4 changes: 4 additions & 0 deletions templates/podman-rootful.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,7 @@ message: |
podman system connection default lima-{{.Name}}
podman{{if eq .HostOS "linux"}} --remote{{end}} run quay.io/podman/hello
------
# 9p is broken in Linux v6.9, v6.10, and v6.11 (used by Fedora 41).
# The issue was fixed in Linux v6.12-rc5 (https://github.com/torvalds/linux/commit/be2ca38).
mountTypesUnsupported: ["9p"]
4 changes: 4 additions & 0 deletions templates/podman.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,7 @@ message: |
podman system connection default lima-{{.Name}}
podman{{if eq .HostOS "linux"}} --remote{{end}} run quay.io/podman/hello
------
# 9p is broken in Linux v6.9, v6.10, and v6.11 (used by Fedora 41).
# The issue was fixed in Linux v6.12-rc5 (https://github.com/torvalds/linux/commit/be2ca38).
mountTypesUnsupported: ["9p"]
4 changes: 4 additions & 0 deletions templates/ubuntu-24.10.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ mounts:
- location: "~"
- location: "/tmp/lima"
writable: true

# 9p is broken in Linux v6.9, v6.10, and v6.11 (used by Ubuntu 24.10).
# The issue was fixed in Linux v6.12-rc5 (https://github.com/torvalds/linux/commit/be2ca38).
mountTypesUnsupported: ["9p"]

0 comments on commit bf9f537

Please sign in to comment.