vm: defer fstrim to after mount during provision (abiosoft#522)

clrxbl · Dec 19, 2022 · 02526c9 · 02526c9
1 parent 7384ed8
commit 02526c9
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/environment/vm/lima/yaml.go b/environment/vm/lima/yaml.go
@@ -104,11 +104,6 @@ func newConf(ctx context.Context, conf config.Config) (l Config, err error) {
 			Script: `grep -q "^rc_env_allow" /etc/rc.conf || echo 'rc_env_allow="*"' >> /etc/rc.conf`,
 		})
 
-		// trim mounted drive to recover disk space
-		l.Provision = append(l.Provision, Provision{
-			Mode:   ProvisionModeSystem,
-			Script: `readlink /sbin/fstrim || fstrim -a`,
-		})
 	}
 
 	// network setup
@@ -242,6 +237,12 @@ func newConf(ctx context.Context, conf config.Config) (l Config, err error) {
 		Script: "mkmntdirs && mount -a",
 	})
 
+	// trim mounted drive to recover disk space
+	l.Provision = append(l.Provision, Provision{
+		Mode:   ProvisionModeSystem,
+		Script: `readlink /sbin/fstrim || fstrim -a`,
+	})
+
 	if len(conf.Mounts) == 0 {
 		l.Mounts = append(l.Mounts,
 			Mount{Location: "~", Writable: true},