Merge pull request #23444 from rhatdan/quadlet

Use new syntax for selinux options in quadlet
containers · Jul 30, 2024 · 95c78b2 · 95c78b2
2 parents b4d0c95 + 1c46686
commit 95c78b2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go
@@ -617,12 +617,12 @@ func ConvertContainer(container *parser.UnitFile, names map[string]string, isUse
 
 	securityLabelDisable := container.LookupBooleanWithDefault(ContainerGroup, KeySecurityLabelDisable, false)
 	if securityLabelDisable {
-		podman.add("--security-opt", "label:disable")
+		podman.add("--security-opt", "label=disable")
 	}
 
 	securityLabelNested := container.LookupBooleanWithDefault(ContainerGroup, KeySecurityLabelNested, false)
 	if securityLabelNested {
-		podman.add("--security-opt", "label:nested")
+		podman.add("--security-opt", "label=nested")
 	}
 
 	pidsLimit, ok := container.Lookup(ContainerGroup, KeyPidsLimit)

diff --git a/test/e2e/quadlet/disableselinux.container b/test/e2e/quadlet/disableselinux.container
@@ -1,5 +1,5 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args "--security-opt" "label:disable"
+## assert-podman-args "--security-opt" "label=disable"
 
 [Container]
 Image=localhost/imagename

diff --git a/test/e2e/quadlet/nestedselinux.container b/test/e2e/quadlet/nestedselinux.container
@@ -1,4 +1,4 @@
-## assert-podman-args "--security-opt" "label:nested"
+## assert-podman-args "--security-opt" "label=nested"
 
 [Container]
 Image=localhost/imagename