Merge pull request #1441 from stgraber/storage

incusd/daemon_storage: Ensure corect symlinks for images/backups

cmd/incusd/daemon_storage.go

@@ -111,6 +111,15 @@ func daemonStorageMount(s *state.State) error {
 			return fmt.Errorf("Failed to mount storage volume %q: %w", source, err)
 		}
 
+		// Ensure we have the correct symlink in place.
+		volStorageName := project.StorageVolume(api.ProjectDefaultName, volumeName)
+
+		_ = os.RemoveAll(internalUtil.VarPath(storageType))
+		err = os.Symlink(internalUtil.VarPath("storage-pools", poolName, "custom", volStorageName), internalUtil.VarPath(storageType))
+		if err != nil {
+			return fmt.Errorf("Failed to set up symlink for %q: %w", storageType, err)
+		}
+
 		return nil
 	}