Skip to content

Commit aaa2984

Browse files
committed
Revert "wsl2: temporarily remove docs"
Revert PR 1866 Signed-off-by: Akihiro Suda <[email protected]>
1 parent 7493e1d commit aaa2984

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

pkg/wsl2/wsl_driver_windows.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@ func (l *LimaWslDriver) Validate() error {
101101

102102
func (l *LimaWslDriver) Start(ctx context.Context) (chan error, error) {
103103
logrus.Infof("Starting WSL VM")
104-
105-
// Keep this warning below, at least until we can get the driver to work on GHA Large Runner (windows-2022-8-cores).
106-
// A failed attempt can be found at https://github.com/lima-vm/lima/pull/1826
107-
logrus.Warnf("wsl2 driver is experimental and seems currently unstable. Help wanted to fix it.")
108-
109104
status, err := store.GetWslStatus(l.Instance.Name)
110105
if err != nil {
111106
return nil, err

website/content/en/docs/Config/Mount/_index.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,6 @@ mounts:
138138
- For Linux, the "virtiofs" mount type requires the [Rust version of virtiofsd](https://gitlab.com/virtio-fs/virtiofsd).
139139
Using the version from QEMU (usually packaged as `qemu-virtiofsd`) will *not* work, as it requires root access to run.
140140

141-
<!-- WSL2 driver seems currently unstable -->
142-
<!--
143141
### wsl2
144142
> **Warning**
145143
> "wsl2" mode is experimental
@@ -167,4 +165,3 @@ mountType: "wsl2"
167165
#### Caveats
168166
- WSL2 file permissions may not work exactly as expected when accessing files that are natively on the Windows disk ([more info](https://github.com/MicrosoftDocs/WSL/blob/mattw-wsl2-explainer/WSL/file-permissions.md))
169167
- WSL2's disk sharing system uses a 9P protocol server, making the performance similar to [Lima's 9p](#9p) mode ([more info](https://github.com/MicrosoftDocs/WSL/blob/mattw-wsl2-explainer/WSL/wsl2-architecture.md#wsl-2-architectural-flow))
170-
-->

website/content/en/docs/Config/VMType/_index.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ The vmType of existing instances cannot be changed.
1313
See the following flowchart to choose the best vmType for you:
1414
```mermaid
1515
flowchart
16-
host{"Host OS"} -- "Linux" --> qemu["QEMU"]
16+
host{"Host OS"} -- "Windows" --> wsl2["WSL2"]
17+
host -- "Linux" --> qemu["QEMU"]
1718
host -- "macOS" --> intel_on_arm{"Need to run <br> Intel binaries <br> on ARM?"}
1819
intel_on_arm -- "Yes" --> just_elf{"Just need to <br> run Intel userspace (fast), <br> or entire Intel VM (slow)?"}
1920
just_elf -- "Userspace (fast)" --> vz
@@ -68,8 +69,6 @@ mountType: "virtiofs"
6869
https://github.com/lima-vm/lima/issues/1577#issuecomment-1565625668
6970
The issue is fixed in macOS 13.5.
7071

71-
<!-- WSL2 driver seems currently unstable -->
72-
<!--
7372
## WSL2
7473
> **Warning**
7574
> "wsl2" mode is experimental
@@ -111,4 +110,3 @@ containerd:
111110
- When running lima using "wsl2", `${LIMA_HOME}/<INSTANCE>/serial.log` will not contain kernel boot logs
112111
- WSL2 requires a `tar` formatted rootfs archive instead of a VM image
113112
- Windows doesn't ship with ssh.exe, gzip.exe, etc. which are used by Lima at various points. The easiest way around this is to run `winget install -e --id Git.MinGit` (winget is now built in to Windows as well), and add the resulting `C:\Program Files\Git\usr\bin\` directory to your path.
114-
-->

0 commit comments

Comments
 (0)