Merge branch 'lima-vm:master' into doc-update

Author: kairveeehh

.github/workflows/release.yml

@@ -110,7 +110,7 @@ jobs:
         - - -
         Release manager: [ADD YOUR NAME HERE] (@[ADD YOUR GITHUB ID HERE])
         EOF
-    - uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2  # v2.2.3
+    - uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd  # v2.3.0
       if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
       with:
         subject-path: _artifacts/*

cmd/limactl/disk.go

@@ -9,12 +9,16 @@ import (
 	"fmt"
 	"io/fs"
 	"os"
+	"path/filepath"
 	"text/tabwriter"
 
+	contfs "github.com/containerd/continuity/fs"
 	"github.com/docker/go-units"
+	"github.com/lima-vm/go-qcow2reader"
 	"github.com/lima-vm/lima/pkg/nativeimgutil"
 	"github.com/lima-vm/lima/pkg/qemu"
 	"github.com/lima-vm/lima/pkg/store"
+	"github.com/lima-vm/lima/pkg/store/filenames"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -44,6 +48,7 @@ func newDiskCommand() *cobra.Command {
 		newDiskDeleteCommand(),
 		newDiskUnlockCommand(),
 		newDiskResizeCommand(),
+		newDiskImportCommand(),
 	)
 	return diskCommand
 }
@@ -418,3 +423,64 @@ func diskResizeAction(cmd *cobra.Command, args []string) error {
 func diskBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 	return bashCompleteDiskNames(cmd)
 }
+
+func newDiskImportCommand() *cobra.Command {
+	diskImportCommand := &cobra.Command{
+		Use: "import DISK FILE",
+		Example: `
+Import a disk:
+$ limactl disk import DISK DISKPATH
+`,
+		Short:             "Import an existing disk to Lima",
+		Args:              WrapArgsError(cobra.ExactArgs(2)),
+		RunE:              diskImportAction,
+		ValidArgsFunction: diskBashComplete,
+	}
+	return diskImportCommand
+}
+
+func diskImportAction(_ *cobra.Command, args []string) error {
+	diskName := args[0]
+	fName := args[1]
+
+	diskDir, err := store.DiskDir(diskName)
+	if err != nil {
+		return err
+	}
+
+	if _, err := os.Stat(diskDir); !errors.Is(err, fs.ErrNotExist) {
+		return fmt.Errorf("disk %q already exists (%q)", diskName, diskDir)
+	}
+
+	f, err := os.Open(fName)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	img, err := qcow2reader.Open(f)
+	if err != nil {
+		return err
+	}
+
+	diskSize := img.Size()
+	format := img.Type()
+
+	switch format {
+	case "qcow2", "raw":
+	default:
+		return fmt.Errorf(`disk format %q not supported, use "qcow2" or "raw" instead`, format)
+	}
+
+	if err := os.MkdirAll(diskDir, 0o755); err != nil {
+		return err
+	}
+
+	if err := contfs.CopyFile(filepath.Join(diskDir, filenames.DataDisk), fName); err != nil {
+		return nil
+	}
+
+	logrus.Infof("Imported %s with size %s", diskName, units.BytesSize(float64(diskSize)))
+
+	return nil
+}

pkg/version/versionutil/versionutil.go

@@ -11,10 +11,12 @@ import (
 
 // Parse parses a Lima version string by removing the leading "v" character and
 // stripping everything from the first "-" forward (which are `git describe` artifacts and
-// not semver pre-release markers). So "v0.19.1-16-gf3dc6ed.m" will be parsed as "0.19.1".
+// not semver pre-release markers) or cutting ".m" suffix from exact version.
+// So "v0.19.1-16-gf3dc6ed.m" will be parsed as "0.19.1".
 func Parse(version string) (*semver.Version, error) {
 	version = strings.TrimPrefix(version, "v")
 	version, _, _ = strings.Cut(version, "-")
+	version = strings.TrimSuffix(version, ".m")
 	return semver.NewVersion(version)
 }
 

pkg/version/versionutil/versionutil_test.go

@@ -27,3 +27,17 @@ func TestGreaterEqual(t *testing.T) {
 	assert.Equal(t, GreaterEqual("0.2.0", "0.1.0"), true)
 	assert.Equal(t, GreaterEqual("abacab", "0.1.0"), true)
 }
+
+func TestParse(t *testing.T) {
+	v1, err1 := Parse("v0.19.1-16-gf3dc6ed.m")
+	assert.NilError(t, err1)
+	assert.Equal(t, v1.Major, int64(0))
+	assert.Equal(t, v1.Minor, int64(19))
+	assert.Equal(t, v1.Patch, int64(1))
+
+	v2, err2 := Parse("v0.19.1.m")
+	assert.NilError(t, err2)
+	assert.Equal(t, v2.Major, int64(0))
+	assert.Equal(t, v2.Minor, int64(19))
+	assert.Equal(t, v2.Patch, int64(1))
+}

templates/_images/fedora-41.yaml

@@ -7,6 +7,10 @@ images:
   arch: aarch64
   digest: sha256:085883b42c7e3b980e366a1fe006cd0ff15877f7e6e984426f3c6c67c7cc2faa
 
+- location: https://dl.fedoraproject.org/pub/alt/risc-v/release/41/Cloud/riscv64/images/Fedora-Cloud-Base-Generic-41.20250224-1026a2d0e311.riscv64.qcow2
+  arch: riscv64
+  digest: sha256:6a8272a858d7f1498f49ce362b34f0b9b959885f63285158947e045abfeece40
+
 # 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]

templates/_images/fedora-42.yaml

@@ -7,6 +7,9 @@ images:
   arch: aarch64
   digest: sha256:e10658419a8d50231037dc781c3155aa94180a8c7a74e5cac2a6b09eaa9342b7
 
+- location: https://dl.fedoraproject.org/pub/alt/risc-v/release/42/Cloud/riscv64/images/Fedora-Cloud-Base-Generic-42.20250414-8635a3a5bfcd.riscv64.qcow2
+  arch: riscv64
+  digest: sha256:537c67710f4f1c9112fecaafafc293b649acd1d35b46619b97b5a5a0132241b0
 
 # # NOTE: Intel Mac requires setting vmType to qemu
 # # https://github.com/lima-vm/lima/issues/3334

templates/experimental/debian-sid.yaml

@@ -9,4 +9,7 @@ images:
 - location: https://cloud.debian.org/images/cloud/sid/daily/latest/debian-sid-genericcloud-arm64-daily.qcow2
   arch: aarch64
 
+- location: https://cloud.debian.org/images/cloud/sid/daily/latest/debian-sid-genericcloud-riscv64-daily.qcow2
+  arch: riscv64
+
 mountTypesUnsupported: [9p]