Merge pull request #1764 from schnoddelbotz/main

stgraber · web-flow · commit e6e2a2ba4528 · 2025-03-14T18:07:24.000-04:00
incus/copy: Clear full device when overriding with type=none
diff --git a/cmd/incus/copy.go b/cmd/incus/copy.go
@@ -206,6 +206,12 @@ func (c *cmdCopy) copyInstance(conf *config.Config, sourceResource string, destR
 				continue
 			}
 
+			if m["type"] == "none" {
+				// When overriding with "none" type, clear the entire device.
+				entry.Devices[k] = map[string]string{"type": "none"}
+				continue
+			}
+
 			for key, value := range m {
 				entry.Devices[k][key] = value
 			}
@@ -298,6 +304,12 @@ func (c *cmdCopy) copyInstance(conf *config.Config, sourceResource string, destR
 				continue
 			}
 
+			if m["type"] == "none" {
+				// When overriding with "none" type, clear the entire device.
+				entry.Devices[k] = map[string]string{"type": "none"}
+				continue
+			}
+
 			for key, value := range m {
 				entry.Devices[k][key] = value
 			}

Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,12 @@ func (c cmdCopy) copyInstance(conf config.Config, sourceResource string, destR`
`206`	`206`	`continue`
`207`	`207`	`}`
`208`	`208`
	`209`	`+ if m["type"] == "none" {`
	`210`	`+ // When overriding with "none" type, clear the entire device.`
	`211`	`+ entry.Devices[k] = map[string]string{"type": "none"}`
	`212`	`+ continue`
	`213`	`+ }`
	`214`	`+`
`209`	`215`	`for key, value := range m {`
`210`	`216`	`entry.Devices[k][key] = value`
`211`	`217`	`}`
`@@ -298,6 +304,12 @@ func (c cmdCopy) copyInstance(conf config.Config, sourceResource string, destR`
`298`	`304`	`continue`
`299`	`305`	`}`
`300`	`306`
	`307`	`+ if m["type"] == "none" {`
	`308`	`+ // When overriding with "none" type, clear the entire device.`
	`309`	`+ entry.Devices[k] = map[string]string{"type": "none"}`
	`310`	`+ continue`
	`311`	`+ }`
	`312`	`+`
`301`	`313`	`for key, value := range m {`
`302`	`314`	`entry.Devices[k][key] = value`
`303`	`315`	`}`