incus: sync size of the default pool on startup (#1415)

* incus: sync size of the default pool on startup

Signed-off-by: Abiola Ibrahim <git@abiosoft.com>

* chore: incus: reword print output

Signed-off-by: Abiola Ibrahim <git@abiosoft.com>

---------

Signed-off-by: Abiola Ibrahim <git@abiosoft.com>

Author: abiosoft

environment/container/incus/incus.go

@@ -156,6 +156,15 @@ func (c *incusRuntime) Start(ctx context.Context) error {
 		})
 	}
 
+	// sync disk size for the default pool
+	if conf.Disk > 0 {
+		a.Add(func() error {
+			// this can fail silently
+			_ = c.guest.RunQuiet("sudo", "incus", "storage", "set", "default", "size="+config.Disk(conf.Disk).GiB())
+			return nil
+		})
+	}
+
 	a.Add(func() error {
 		// attempt to set remote
 		if err := c.setRemote(conf.AutoActivate()); err == nil {
@@ -382,7 +391,7 @@ func (c *incusRuntime) recoverDisk(ctx context.Context) error {
 	log.Println()
 	log.Println("Running 'incus admin recover' ...")
 	log.Println()
-	log.Println(fmt.Sprintf("Found %d storage pool sources:", len(disks)))
+	log.Println(fmt.Sprintf("Found %d storage pool source(s):", len(disks)))
 	for _, disk := range disks {
 		log.Println("  " + poolDisksDir + "/" + disk)
 	}

environment/vm/lima/yaml.go

@@ -330,19 +330,33 @@ func newConf(ctx context.Context, conf config.Config) (l limaconfig.Config, err
 		}
 	}
 
+	/*
+		provision scripts for disk actions
+	*/
+
+	// ensure all volumes are mounted.
 	l.Provision = append(l.Provision, limaconfig.Provision{
 		Mode:   limaconfig.ProvisionModeSystem,
 		Script: "mount -a",
 	})
 
 	// trim mounted drive to recover disk space
+	// however problematic for incus
 	if conf.Runtime != incus.Name {
 		l.Provision = append(l.Provision, limaconfig.Provision{
 			Mode:   limaconfig.ProvisionModeSystem,
 			Script: `readlink /usr/sbin/fstrim || fstrim -a`,
 		})
 	}
 
+	// grow partition in case disk size has increased
+	l.Provision = append(l.Provision, limaconfig.Provision{
+		Mode:   limaconfig.ProvisionModeSystem,
+		Script: "resize2fs " + diskByLabelPath(config.CurrentProfile().ID) + " || true",
+	})
+
+	/* end */
+
 	if len(conf.Mounts) == 0 {
 		l.Mounts = append(l.Mounts,
 			limaconfig.Mount{Location: "~", Writable: true},
@@ -443,3 +457,14 @@ func ingressDisabled(disableFlags []string) bool {
 	}
 	return false
 }
+
+const diskLabelMaxLength = 16 // https://tldp.org/HOWTO/Partition/labels.html
+
+func diskByLabelPath(instanceId string) string {
+	name := "lima-" + instanceId
+	if len(name) > diskLabelMaxLength {
+		name = name[:diskLabelMaxLength]
+	}
+
+	return "/dev/disk/by-label/" + name
+}