Skip to content

Commit 9afb25c

Browse files
janduboisjandubois
authored
Merge pull request #2822 from AkihiroSuda/9p-linux-6.9
templates: update fedora to 41; templates: disable 9p for Linux 6.9-6.11
2 parents 21bbd82 + bf9f537 commit 9afb25c

File tree

7 files changed

+41
-15
lines changed

7 files changed

+41
-15
lines changed

‎pkg/limayaml/limayaml_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ func TestDefaultYAML(t *testing.T) {
3434
var y LimaYAML
3535
err = Unmarshal(bytes, &y, "")
3636
assert.NilError(t, err)
37-
y.Images = nil // remove default images
38-
y.Mounts = nil // remove default mounts
37+
y.Images = nil // remove default images
38+
y.Mounts = nil // remove default mounts
39+
y.MountTypesUnsupported = nil // remove default workaround for kernel 6.9-6.11
3940
t.Log(dumpJSON(t, y))
4041
b, err := Marshal(&y, false)
4142
assert.NilError(t, err)

‎templates/archlinux.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ mounts:
1717
- location: "~"
1818
- location: "/tmp/lima"
1919
writable: true
20+
21+
# 9p is broken in Linux v6.9, v6.10, and v6.11.
22+
# The issue was fixed in Linux v6.12-rc5 (https://github.com/torvalds/linux/commit/be2ca38).
23+
mountTypesUnsupported: ["9p"]

‎templates/default.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,14 @@ mounts:
106106

107107
# List of mount types not supported by the kernel of this distro.
108108
# Also used to resolve the default mount type when not explicitly specified.
109+
#
110+
# NOTE: 9p is broken in Linux v6.9, v6.10, and v6.11.
111+
# The issue was fixed in Linux v6.12-rc5 (https://github.com/torvalds/linux/commit/be2ca38).
112+
#
109113
# 🟢 Builtin default: []
114+
# 🔵 This file: ["9p"] (as Ubuntu 24.10 uses kernel 6.11)
110115
mountTypesUnsupported:
111-
# - "9p"
116+
- "9p"
112117

113118
# Mount type for above mounts, such as "reverse-sshfs" (from sshocker), "9p" (QEMU’s virtio-9p-pci, aka virtfs),
114119
# or "virtiofs" (experimental on Linux; needs `vmType: vz` on macOS).

‎templates/fedora.yaml

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
# This template requires Lima v0.7.0 or later.
22
images:
3-
- location: "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/x86_64/images/Fedora-Cloud-Base-Generic.x86_64-40-1.14.qcow2"
3+
- location: "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2"
44
arch: "x86_64"
5-
digest: "sha256:ac58f3c35b73272d5986fa6d3bc44fd246b45df4c334e99a07b3bbd00684adee"
6-
- location: "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/aarch64/images/Fedora-Cloud-Base-Generic.aarch64-40-1.14.qcow2"
5+
digest: "sha256:6205ae0c524b4d1816dbd3573ce29b5c44ed26c9fbc874fbe48c41c89dd0bac2"
6+
- location: "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/aarch64/images/Fedora-Cloud-Base-Generic-41-1.4.aarch64.qcow2"
77
arch: "aarch64"
8-
digest: "sha256:ebdce26d861a9d15072affe1919ed753ec7015bd97b3a7d0d0df6a10834f7459"
8+
digest: "sha256:085883b42c7e3b980e366a1fe006cd0ff15877f7e6e984426f3c6c67c7cc2faa"
99
mounts:
1010
- location: "~"
1111
- location: "/tmp/lima"
1212
writable: true
13+
14+
# 9p is broken in Linux v6.9, v6.10, and v6.11 (used by Fedora 41).
15+
# The issue was fixed in Linux v6.12-rc5 (https://github.com/torvalds/linux/commit/be2ca38).
16+
mountTypesUnsupported: ["9p"]

‎templates/podman-rootful.yaml

+8-4
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
# This template requires Lima v0.20.0 or later
1414
images:
15-
- location: "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/x86_64/images/Fedora-Cloud-Base-Generic.x86_64-40-1.14.qcow2"
15+
- location: "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2"
1616
arch: "x86_64"
17-
digest: "sha256:ac58f3c35b73272d5986fa6d3bc44fd246b45df4c334e99a07b3bbd00684adee"
18-
- location: "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/aarch64/images/Fedora-Cloud-Base-Generic.aarch64-40-1.14.qcow2"
17+
digest: "sha256:6205ae0c524b4d1816dbd3573ce29b5c44ed26c9fbc874fbe48c41c89dd0bac2"
18+
- location: "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/aarch64/images/Fedora-Cloud-Base-Generic-41-1.4.aarch64.qcow2"
1919
arch: "aarch64"
20-
digest: "sha256:ebdce26d861a9d15072affe1919ed753ec7015bd97b3a7d0d0df6a10834f7459"
20+
digest: "sha256:085883b42c7e3b980e366a1fe006cd0ff15877f7e6e984426f3c6c67c7cc2faa"
2121

2222
mounts:
2323
- location: "~"
@@ -68,3 +68,7 @@ message: |
6868
podman system connection default lima-{{.Name}}
6969
podman{{if eq .HostOS "linux"}} --remote{{end}} run quay.io/podman/hello
7070
------
71+
72+
# 9p is broken in Linux v6.9, v6.10, and v6.11 (used by Fedora 41).
73+
# The issue was fixed in Linux v6.12-rc5 (https://github.com/torvalds/linux/commit/be2ca38).
74+
mountTypesUnsupported: ["9p"]

‎templates/podman.yaml

+8-4
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
# This template requires Lima v0.8.0 or later
1414
images:
15-
- location: "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/x86_64/images/Fedora-Cloud-Base-Generic.x86_64-40-1.14.qcow2"
15+
- location: "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2"
1616
arch: "x86_64"
17-
digest: "sha256:ac58f3c35b73272d5986fa6d3bc44fd246b45df4c334e99a07b3bbd00684adee"
18-
- location: "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/aarch64/images/Fedora-Cloud-Base-Generic.aarch64-40-1.14.qcow2"
17+
digest: "sha256:6205ae0c524b4d1816dbd3573ce29b5c44ed26c9fbc874fbe48c41c89dd0bac2"
18+
- location: "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/aarch64/images/Fedora-Cloud-Base-Generic-41-1.4.aarch64.qcow2"
1919
arch: "aarch64"
20-
digest: "sha256:ebdce26d861a9d15072affe1919ed753ec7015bd97b3a7d0d0df6a10834f7459"
20+
digest: "sha256:085883b42c7e3b980e366a1fe006cd0ff15877f7e6e984426f3c6c67c7cc2faa"
2121

2222
mounts:
2323
- location: "~"
@@ -57,3 +57,7 @@ message: |
5757
podman system connection default lima-{{.Name}}
5858
podman{{if eq .HostOS "linux"}} --remote{{end}} run quay.io/podman/hello
5959
------
60+
61+
# 9p is broken in Linux v6.9, v6.10, and v6.11 (used by Fedora 41).
62+
# The issue was fixed in Linux v6.12-rc5 (https://github.com/torvalds/linux/commit/be2ca38).
63+
mountTypesUnsupported: ["9p"]

‎templates/ubuntu-24.10.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,7 @@ mounts:
2727
- location: "~"
2828
- location: "/tmp/lima"
2929
writable: true
30+
31+
# 9p is broken in Linux v6.9, v6.10, and v6.11 (used by Ubuntu 24.10).
32+
# The issue was fixed in Linux v6.12-rc5 (https://github.com/torvalds/linux/commit/be2ca38).
33+
mountTypesUnsupported: ["9p"]

0 commit comments

Comments
 (0)