Check FSType to improve disk messages

Previous disk had hardcoded mountpoint.

But now it will not be used, for swap.

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>

Author: afbjorklund

cmd/limactl/disk.go

@@ -180,7 +180,7 @@ func diskListAction(cmd *cobra.Command, args []string) error {
 
 	if jsonFormat {
 		for _, diskName := range disks {
-			disk, err := store.InspectDisk(diskName)
+			disk, err := store.InspectDisk(diskName, nil)
 			if err != nil {
 				logrus.WithError(err).Errorf("disk %q does not exist?", diskName)
 				continue
@@ -202,7 +202,7 @@ func diskListAction(cmd *cobra.Command, args []string) error {
 	}
 
 	for _, diskName := range disks {
-		disk, err := store.InspectDisk(diskName)
+		disk, err := store.InspectDisk(diskName, nil)
 		if err != nil {
 			logrus.WithError(err).Errorf("disk %q does not exist?", diskName)
 			continue
@@ -254,7 +254,7 @@ func diskDeleteAction(cmd *cobra.Command, args []string) error {
 	}
 
 	for _, diskName := range args {
-		disk, err := store.InspectDisk(diskName)
+		disk, err := store.InspectDisk(diskName, nil)
 		if err != nil {
 			if errors.Is(err, fs.ErrNotExist) {
 				logrus.Warnf("Ignoring non-existent disk %q", diskName)
@@ -325,7 +325,7 @@ $ limactl disk unlock DISK1 DISK2 ...
 func diskUnlockAction(cmd *cobra.Command, args []string) error {
 	ctx := cmd.Context()
 	for _, diskName := range args {
-		disk, err := store.InspectDisk(diskName)
+		disk, err := store.InspectDisk(diskName, nil)
 		if err != nil {
 			if errors.Is(err, fs.ErrNotExist) {
 				logrus.Warnf("Ignoring non-existent disk %q", diskName)
@@ -387,7 +387,7 @@ func diskResizeAction(cmd *cobra.Command, args []string) error {
 	}
 
 	diskName := args[0]
-	disk, err := store.InspectDisk(diskName)
+	disk, err := store.InspectDisk(diskName, nil)
 	if err != nil {
 		if errors.Is(err, fs.ErrNotExist) {
 			return fmt.Errorf("disk %q does not exists", diskName)

pkg/driver/krunkit/krunkit_darwin_arm64.go

@@ -54,7 +54,7 @@ func Cmdline(inst *limatype.Instance) (*exec.Cmd, error) {
 		ctx := context.Background()
 		diskUtil := proxyimgutil.NewDiskUtil(ctx)
 		for _, d := range inst.Config.AdditionalDisks {
-			disk, derr := store.InspectDisk(d.Name)
+			disk, derr := store.InspectDisk(d.Name, d.FSType)
 			if derr != nil {
 				return nil, fmt.Errorf("failed to load disk %q: %w", d.Name, derr)
 			}

pkg/driver/qemu/qemu.go

@@ -692,7 +692,7 @@ func Cmdline(ctx context.Context, cfg Config) (exe string, args []string, err er
 	extraDisks := []string{}
 	for _, d := range y.AdditionalDisks {
 		diskName := d.Name
-		disk, err := store.InspectDisk(diskName)
+		disk, err := store.InspectDisk(diskName, d.FSType)
 		if err != nil {
 			logrus.Errorf("could not load disk %q: %q", diskName, err)
 			return "", nil, err

pkg/driver/vz/vm_darwin.go

@@ -499,7 +499,7 @@ func attachDisks(ctx context.Context, inst *limatype.Instance, vmConfig *vz.Virt
 
 	for _, d := range inst.Config.AdditionalDisks {
 		diskName := d.Name
-		disk, err := store.InspectDisk(diskName)
+		disk, err := store.InspectDisk(diskName, d.FSType)
 		if err != nil {
 			return fmt.Errorf("failed to run load disk %q: %w", diskName, err)
 		}

pkg/hostagent/hostagent.go

@@ -554,7 +554,7 @@ sudo chown -R "${USER}" /run/host-services`
 		a.cleanUp(func() error {
 			var unlockErrs []error
 			for _, d := range a.instConfig.AdditionalDisks {
-				disk, inspectErr := store.InspectDisk(d.Name)
+				disk, inspectErr := store.InspectDisk(d.Name, d.FSType)
 				if inspectErr != nil {
 					unlockErrs = append(unlockErrs, inspectErr)
 					continue

pkg/instance/stop.go

@@ -118,7 +118,7 @@ func StopForcibly(inst *limatype.Instance) {
 
 	for _, d := range inst.AdditionalDisks {
 		diskName := d.Name
-		disk, err := store.InspectDisk(diskName)
+		disk, err := store.InspectDisk(diskName, d.FSType)
 		if err != nil {
 			logrus.Warnf("Disk %q does not exist", diskName)
 			continue

pkg/store/disk.go

@@ -23,11 +23,15 @@ type Disk struct {
 	Instance    string `json:"instance"`
 	InstanceDir string `json:"instanceDir"`
 	MountPoint  string `json:"mountPoint"`
+
+	// if the Disk is in use and the FSType is specified
+	FSType *string `json:"fsType,omitempty"`
 }
 
-func InspectDisk(diskName string) (*Disk, error) {
+func InspectDisk(diskName string, fsType *string) (*Disk, error) {
 	disk := &Disk{
-		Name: diskName,
+		Name:   diskName,
+		FSType: fsType,
 	}
 
 	diskDir, err := DiskDir(diskName)
@@ -56,7 +60,11 @@ func InspectDisk(diskName string) (*Disk, error) {
 		disk.InstanceDir = instDir
 	}
 
-	disk.MountPoint = fmt.Sprintf("/mnt/lima-%s", diskName)
+	if disk.FSType != nil && *disk.FSType == "swap" {
+		disk.MountPoint = "swap" // only used for logging messages
+	} else {
+		disk.MountPoint = fmt.Sprintf("/mnt/lima-%s", diskName)
+	}
 
 	return disk, nil
 }