Add initial WSL2 VM support in Lima

Author: arixmkii

README.md

@@ -263,10 +263,9 @@ There is no way to use file system mounts in Podman with QEMU on Windows hosts.
 
 Additional work is required to bring AF_UNIX port forwarding (same applied to Unix socket to named pipe forwarding)
 
-### 2. WSL driver is currently broken
+### 2. Containers in WSL2 machine are not operational
 
-Lima supprot is in prototype stage and numerous features from original version are broken, this includes support for provisioning
-WSL2 VMs using Lima. Only QEMU driver is supported in this rebuild.
+Rootless containerd is not installing and rootful containerd lacks networking connectivity.
 
 ### 3. Key pairs created with official Lima instance will lack Unix permissions and will be rejected
 

patches/AlpineWSL/0002-Add-Lima-customizations.patch

@@ -1,22 +1,22 @@
-From 7df9651f4e754513c3578e97b64e6eeac1515373 Mon Sep 17 00:00:00 2001
+From 9ef3ad3959d37b6d78c51f8fe9c212ae7c6f9526 Mon Sep 17 00:00:00 2001
 From: Arthur Sengileyev <[email protected]>
 Date: Tue, 28 Jan 2025 14:55:26 +0200
 Subject: [PATCH] Add Lima customizations
 
 ---
- src_x64/Makefile              |  9 ++++++---
+ src_x64/Makefile              | 10 +++++++---
  src_x64/cygpath               |  5 +++++
  src_x64/oobe.sh               |  8 ++++++++
  src_x64/wsl-distribution.conf |  4 ++++
  src_x64/wsl.conf              | 10 ++++++++++
- 5 files changed, 33 insertions(+), 3 deletions(-)
+ 5 files changed, 34 insertions(+), 3 deletions(-)
  create mode 100755 src_x64/cygpath
  create mode 100755 src_x64/oobe.sh
  create mode 100644 src_x64/wsl-distribution.conf
  create mode 100644 src_x64/wsl.conf
 
 diff --git a/src_x64/Makefile b/src_x64/Makefile
-index ead99a0..de75b76 100644
+index ead99a0..f734975 100644
 --- a/src_x64/Makefile
 +++ b/src_x64/Makefile
 @@ -3,7 +3,7 @@ LNCR_EXE=Alpine.exe
@@ -28,13 +28,14 @@ index ead99a0..de75b76 100644
  ROOTFS_TARBALL_CKSM_URL=${BASE_URL}.sha512
  LNCR_ZIP_URL=https://github.com/yuk7/wsldl/releases/download/23072600/icons.zip
  LNCR_ZIP_EXE=Alpine.exe
-@@ -43,9 +43,12 @@ rootfs: base.tar.gz profile
+@@ -43,9 +43,13 @@ rootfs: base.tar.gz profile
  	sudo cp -f /etc/resolv.conf rootfs/etc/resolv.conf
  	sudo cp -f profile rootfs/etc/profile
  	sudo chroot rootfs /sbin/apk update
 -	sudo chroot rootfs /sbin/apk add bash
 -	echo "# This file was automatically generated by WSL. To stop automatic generation of this file, remove this line." | sudo tee rootfs/etc/resolv.conf
-+	sudo chroot rootfs /sbin/apk add bash openssh openssh-client-krb5 socat
++	sudo chroot rootfs /sbin/apk add bash openssh openssh-client-krb5 socat libdeflate-utils
++	sudo chroot rootfs /bin/ln -s /usr/bin/libdeflate-gzip /usr/local/bin/gzip # https://github.com/microsoft/WSL/issues/12523
  	sudo rm -rf `sudo find rootfs/var/cache/apk/ -type f`
 +	sudo cp -f oobe.sh rootfs/etc/oobe.sh
 +	sudo cp -f wsl.conf rootfs/etc/wsl.conf
@@ -56,7 +57,7 @@ index 0000000..975a36f
 +/bin/wslpath "$@"
 diff --git a/src_x64/oobe.sh b/src_x64/oobe.sh
 new file mode 100755
-index 0000000..c9ab254
+index 0000000..f1f14ca
 --- /dev/null
 +++ b/src_x64/oobe.sh
 @@ -0,0 +1,8 @@

patches/lima/0001-Add-QEMU-driver-support-on-Windows-hosts.patch

@@ -1,4 +1,4 @@
-From f97d2c5d7968e6172b9b542a78351854f8e983dd Mon Sep 17 00:00:00 2001
+From cd7ce15a7838fb45e618f445a39599b1ac21c557 Mon Sep 17 00:00:00 2001
 From: Arthur Sengileyev <[email protected]>
 Date: Wed, 22 Jan 2025 17:24:01 +0200
 Subject: [PATCH] Add QEMU driver support on Windows hosts
@@ -13,20 +13,20 @@ Signed-off-by: Arthur Sengileyev <[email protected]>
  contrib/bundle-wsl/wsllinks.ini    |  2 ++
  pkg/cidata/cidata.go               | 11 ++++++++++-
  pkg/hostagent/hostagent.go         |  7 ++++++-
- pkg/hostagent/mount.go             | 21 ++++++++++++++++++---
+ pkg/hostagent/mount.go             | 23 ++++++++++++++++++++---
  pkg/ioutilx/ioutilx.go             |  3 ++-
  pkg/iso9660util/iso9660util.go     |  6 ------
  pkg/osutil/user.go                 |  2 +-
  pkg/qemu/qemu.go                   |  2 ++
  pkg/sshutil/sshutil.go             | 19 ++++++++++---------
  templates/default.yaml             |  2 +-
- 15 files changed, 83 insertions(+), 24 deletions(-)
+ 15 files changed, 85 insertions(+), 24 deletions(-)
  create mode 100644 contrib/bundle-wsl/go-wsllinks.exe
  create mode 100644 contrib/bundle-wsl/sftp-server.ini
  create mode 100644 contrib/bundle-wsl/wsllinks.ini
 
 diff --git a/Makefile b/Makefile
-index 71bea6e4..afde990b 100644
+index 71bea6e4..3d77640f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -551,6 +551,20 @@ artifacts-misc: | _artifacts
@@ -36,7 +36,7 @@ index 71bea6e4..afde990b 100644
 +.PHONY: add-bundles
 +add-bundles: add-bundle-wsl
 +
-+add-bundle-wsl: _output/bin/bundle-wsl/wsllinks.ini _output/bin/bundle-wsl/sftp-server.ini _output/bin/bundle-wsl/cygpath.exe _output/bin/bundle-wsl/id.exe _output/bin/bundle-wsl/realpath.exe _output/bin/bundle-wsl/sftp-server.exe _output/bin/bundle-wsl/ssh.exe _output/bin/bundle-wsl/ssh-keygen.exe 
++add-bundle-wsl: _output/bin/bundle-wsl/wsllinks.ini _output/bin/bundle-wsl/sftp-server.ini _output/bin/bundle-wsl/cygpath.exe _output/bin/bundle-wsl/id.exe _output/bin/bundle-wsl/realpath.exe _output/bin/bundle-wsl/sftp-server.exe _output/bin/bundle-wsl/ssh.exe _output/bin/bundle-wsl/ssh-keygen.exe _output/bin/bundle-wsl/gzip.exe 
 +
 +
 +_output/bin/bundle-wsl/%.ini: contrib/bundle-wsl/%.ini | _output/bin/bundle-wsl
@@ -105,15 +105,15 @@ index 00000000..47d2814a
 --- /dev/null
 +++ b/contrib/bundle-wsl/sftp-server.ini
 @@ -0,0 +1 @@
-+binary = /usr/lib/ssh/sftp-server
++binary = /usr/lib/ssh/sftp-server
 diff --git a/contrib/bundle-wsl/wsllinks.ini b/contrib/bundle-wsl/wsllinks.ini
 new file mode 100644
 index 00000000..60b0c8e8
 --- /dev/null
 +++ b/contrib/bundle-wsl/wsllinks.ini
 @@ -0,0 +1,2 @@
-+distro = lima-infra
-+user = lima
++distro = lima-infra
++user = lima
 diff --git a/pkg/cidata/cidata.go b/pkg/cidata/cidata.go
 index 2030a9a8..bdbca881 100644
 --- a/pkg/cidata/cidata.go
@@ -179,21 +179,22 @@ index 396401a4..212f0c35 100644
 
  	if err := cidata.GenerateCloudConfig(inst.Dir, instName, inst.Config); err != nil {
 diff --git a/pkg/hostagent/mount.go b/pkg/hostagent/mount.go
-index 646dc5d4..d7ef289f 100644
+index 646dc5d4..9a59f25c 100644
 --- a/pkg/hostagent/mount.go
 +++ b/pkg/hostagent/mount.go
-@@ -4,7 +4,10 @@ import (
+@@ -4,7 +4,11 @@ import (
  	"errors"
  	"fmt"
  	"os"
++	"os/exec"
 +	"path"
 +	"runtime"
 
 +	"github.com/lima-vm/lima/pkg/ioutilx"
  	"github.com/lima-vm/lima/pkg/limayaml"
  	"github.com/lima-vm/lima/pkg/localpathutil"
  	"github.com/lima-vm/sshocker/pkg/reversesshfs"
-@@ -36,13 +39,22 @@ func (a *HostAgent) setupMount(m limayaml.Mount) (*mount, error) {
+@@ -36,13 +40,22 @@ func (a *HostAgent) setupMount(m limayaml.Mount) (*mount, error) {
  	if err != nil {
  		return nil, err
  	}
@@ -219,12 +220,13 @@ index 646dc5d4..d7ef289f 100644
  	}
  	// NOTE: allow_other requires "user_allow_other" in /etc/fuse.conf
  	sshfsOptions := "allow_other"
-@@ -64,6 +76,9 @@ func (a *HostAgent) setupMount(m limayaml.Mount) (*mount, error) {
+@@ -64,6 +77,10 @@ func (a *HostAgent) setupMount(m limayaml.Mount) (*mount, error) {
  		Readonly:            !(*m.Writable),
  		SSHFSAdditionalArgs: []string{"-o", sshfsOptions},
  	}
-+	if runtime.GOOS == "windows" {
-+		rsf.OpensshSftpServerBinary = "sftp-server" // using wrapper
++	serverPath, err := exec.LookPath("sftp-server")
++	if err == nil {
++		rsf.OpensshSftpServerBinary = serverPath
 +	}
  	if err := rsf.Prepare(); err != nil {
  		return nil, fmt.Errorf("failed to prepare reverse sshfs for %q on %q: %w", location, mountPoint, err)