Merge pull request #12340 from monstermunchkin/fixes/12325-zfs-regres…

…sion patches: Check server name when unsetting invalid block settings
canonical · Sep 29, 2023 · 264a919 · 264a919
2 parents cfda2b7 + b9e6eb9
commit 264a919
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lxd/patches.go b/lxd/patches.go
@@ -979,6 +979,10 @@ func patchStorageZfsUnsetInvalidBlockSettings(_ string, d *Daemon) error {
 
 	for pool, volumes := range poolVolumes {
 		for _, vol := range volumes {
+			if vol.Location != s.ServerName {
+				continue
+			}
+
 			config := vol.Config
 
 			if shared.IsTrue(config["zfs.block_mode"]) {