Merge pull request #1980 from stgraber/main

incusd/device/disk: Fix registration of custom volumes

Author: hallyn

internal/server/device/disk.go

@@ -746,13 +746,13 @@ func (d *disk) UpdatableFields(oldDevice Type) []string {
 func (d *disk) Register() error {
 	d.logger.Debug("Initialising mounted disk ref counter")
 
-	// Load the pool.
-	pool, err := storagePools.LoadByInstance(d.state, d.inst)
-	if err != nil {
-		return err
-	}
-
 	if d.config["path"] == "/" {
+		// Load the pool.
+		pool, err := storagePools.LoadByInstance(d.state, d.inst)
+		if err != nil {
+			return err
+		}
+
 		// Try to mount the volume that should already be mounted to reinitialize the ref counter.
 		_, err = pool.MountInstance(d.inst, nil)
 		if err != nil {
@@ -764,6 +764,12 @@ func (d *disk) Register() error {
 			return err
 		}
 
+		// Load the pool.
+		pool, err := storagePools.LoadByName(d.state, d.config["pool"])
+		if err != nil {
+			return fmt.Errorf("Failed to get storage pool %q: %w", d.config["pool"], err)
+		}
+
 		// Parse the volume name and path.
 		volFields := strings.SplitN(d.config["source"], "/", 2)
 		volName := volFields[0]