wsl2: attempt to fix dos2unix and quotation issues

Signed-off-by: Akihiro Suda <[email protected]>

Author: AkihiroSuda

.github/workflows/test.yml

@@ -106,6 +106,12 @@ jobs:
       run: |
         .\_output\bin\limactl.exe start template://experimental/wsl2
       # TODO: run the full integration tests
+    - name: Debug
+      if: always()
+      run: type %HOME%\.lima\wsl2\ha.stdout.log
+    - name: Debug
+      if: always()
+      run: type %HOME%\.lima\wsl2\ha.stderr.log
     - name: Unit tests
       run: go test -v ./...
 

pkg/wsl2/lima-init.TEMPLATE

@@ -1,5 +1,6 @@
-set -eu; \
-export LOG_FILE=/var/log/lima-init.log; \
-exec > >(tee \$LOG_FILE) 2>&1; \
-export LIMA_CIDATA_MNT="$(/usr/bin/wslpath '{{.CIDataPath}}')"; \
-exec "\$LIMA_CIDATA_MNT/boot.sh";
+#!/bin/bash
+set -eu
+export LOG_FILE=/var/log/lima-init.log
+exec > >(tee $LOG_FILE) 2>&1
+export LIMA_CIDATA_MNT="$(/usr/bin/wslpath '{{.CIDataPath}}')"
+exec "$LIMA_CIDATA_MNT/boot.sh"

pkg/wsl2/vm_windows.go

@@ -7,9 +7,9 @@ import (
 	"context"
 	_ "embed"
 	"fmt"
+	"os"
 	"os/exec"
 	"path/filepath"
-	"strings"
 
 	"github.com/lima-vm/lima/pkg/executil"
 	"github.com/lima-vm/lima/pkg/store"
@@ -73,11 +73,27 @@ func provisionVM(ctx context.Context, instanceDir, instanceName, distroName stri
 	m := map[string]string{
 		"CIDataPath": ciDataPath,
 	}
-	out, err := textutil.ExecuteTemplate(limaBoot, m)
+	limaBootB, err := textutil.ExecuteTemplate(limaBoot, m)
 	if err != nil {
 		return fmt.Errorf("failed to construct wsl boot.sh script: %w", err)
 	}
-	outString := strings.Replace(string(out), `\r\n`, `\n`, -1)
+	limaBootFile, err := os.CreateTemp("", "lima-wsl2-boot-*.sh")
+	if err != nil {
+		return err
+	}
+	if _, err = limaBootFile.Write(limaBootB); err != nil {
+		return err
+	}
+	limaBootFilePathOnWindows := limaBootFile.Name()
+	if err = limaBootFile.Close(); err != nil {
+		return err
+	}
+	defer os.RemoveAll(limaBootFilePathOnWindows)
+	limaBootFilePathOnLinuxB, err := exec.Command("wsl.exe", "wslpath", "-u", limaBootFilePathOnWindows).Output()
+	if err != nil {
+		return err
+	}
+	limaBootFilePathOnLinux := string(limaBootFilePathOnLinuxB)
 
 	go func() {
 		cmd := exec.CommandContext(
@@ -86,8 +102,7 @@ func provisionVM(ctx context.Context, instanceDir, instanceName, distroName stri
 			"-d",
 			distroName,
 			"bash",
-			"-c",
-			outString,
+			limaBootFilePathOnLinux,
 		)
 		if out, err := cmd.CombinedOutput(); err != nil {
 			*errCh <- fmt.Errorf(