variants: drop unified-cgroup-hierarchy feature

The unified cgroup hierarchy is now the default for systemd, so it's no longer necessary to set this image feature flag to enable it. Signed-off-by: Ben Cressey <[email protected]>
yeazelm · May 1, 2024 · d9b580a · d9b580a
1 parent 927bf40
commit d9b580a
Show file tree

Hide file tree

Showing 24 changed files with 0 additions and 24 deletions.
diff --git a/variants/aws-dev/Cargo.toml b/variants/aws-dev/Cargo.toml
@@ -9,7 +9,6 @@ exclude = ["README.md"]
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 xfs-data-partition = true
 uefi-secure-boot = true
 systemd-networkd = true

diff --git a/variants/aws-ecs-2-nvidia/Cargo.toml b/variants/aws-ecs-2-nvidia/Cargo.toml
@@ -7,7 +7,6 @@ build = "../build.rs"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 uefi-secure-boot = true
 xfs-data-partition = true
 systemd-networkd = true

diff --git a/variants/aws-ecs-2/Cargo.toml b/variants/aws-ecs-2/Cargo.toml
@@ -9,7 +9,6 @@ exclude = ["README.md"]
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 uefi-secure-boot = true
 xfs-data-partition = true
 systemd-networkd = true

diff --git a/variants/aws-k8s-1.26-nvidia/Cargo.toml b/variants/aws-k8s-1.26-nvidia/Cargo.toml
@@ -14,7 +14,6 @@ os-image-size-gib = 4
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 
 [package.metadata.build-variant]
 included-packages = [

diff --git a/variants/aws-k8s-1.26/Cargo.toml b/variants/aws-k8s-1.26/Cargo.toml
@@ -11,7 +11,6 @@ exclude = ["README.md"]
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 
 [package.metadata.build-variant]
 included-packages = [

diff --git a/variants/aws-k8s-1.27-nvidia/Cargo.toml b/variants/aws-k8s-1.27-nvidia/Cargo.toml
@@ -14,7 +14,6 @@ os-image-size-gib = 4
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 
 [package.metadata.build-variant]
 included-packages = [

diff --git a/variants/aws-k8s-1.27/Cargo.toml b/variants/aws-k8s-1.27/Cargo.toml
@@ -11,7 +11,6 @@ exclude = ["README.md"]
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 
 [package.metadata.build-variant]
 included-packages = [

diff --git a/variants/aws-k8s-1.28-nvidia/Cargo.toml b/variants/aws-k8s-1.28-nvidia/Cargo.toml
@@ -14,7 +14,6 @@ os-image-size-gib = 4
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 uefi-secure-boot = true
 xfs-data-partition = true
 systemd-networkd = true

diff --git a/variants/aws-k8s-1.28/Cargo.toml b/variants/aws-k8s-1.28/Cargo.toml
@@ -11,7 +11,6 @@ exclude = ["README.md"]
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 uefi-secure-boot = true
 xfs-data-partition = true
 systemd-networkd = true

diff --git a/variants/aws-k8s-1.29-nvidia/Cargo.toml b/variants/aws-k8s-1.29-nvidia/Cargo.toml
@@ -14,7 +14,6 @@ os-image-size-gib = 4
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 uefi-secure-boot = true
 xfs-data-partition = true
 systemd-networkd = true

diff --git a/variants/aws-k8s-1.29/Cargo.toml b/variants/aws-k8s-1.29/Cargo.toml
@@ -11,7 +11,6 @@ exclude = ["README.md"]
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 uefi-secure-boot = true
 xfs-data-partition = true
 systemd-networkd = true

diff --git a/variants/aws-k8s-1.30-nvidia/Cargo.toml b/variants/aws-k8s-1.30-nvidia/Cargo.toml
@@ -14,7 +14,6 @@ os-image-size-gib = 4
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 uefi-secure-boot = true
 xfs-data-partition = true
 systemd-networkd = true

diff --git a/variants/aws-k8s-1.30/Cargo.toml b/variants/aws-k8s-1.30/Cargo.toml
@@ -11,7 +11,6 @@ exclude = ["README.md"]
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 uefi-secure-boot = true
 xfs-data-partition = true
 systemd-networkd = true

diff --git a/variants/metal-dev/Cargo.toml b/variants/metal-dev/Cargo.toml
@@ -12,7 +12,6 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 xfs-data-partition = true
 uefi-secure-boot = true
 systemd-networkd = true

diff --git a/variants/metal-k8s-1.26/Cargo.toml b/variants/metal-k8s-1.26/Cargo.toml
@@ -15,7 +15,6 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 
 [package.metadata.build-variant]
 image-format = "raw"

diff --git a/variants/metal-k8s-1.27/Cargo.toml b/variants/metal-k8s-1.27/Cargo.toml
@@ -15,7 +15,6 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 
 [package.metadata.build-variant]
 image-format = "raw"

diff --git a/variants/metal-k8s-1.28/Cargo.toml b/variants/metal-k8s-1.28/Cargo.toml
@@ -15,7 +15,6 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 uefi-secure-boot = true
 xfs-data-partition = true
 systemd-networkd = true

diff --git a/variants/metal-k8s-1.29/Cargo.toml b/variants/metal-k8s-1.29/Cargo.toml
@@ -15,7 +15,6 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 uefi-secure-boot = true
 xfs-data-partition = true
 systemd-networkd = true

diff --git a/variants/vmware-dev/Cargo.toml b/variants/vmware-dev/Cargo.toml
@@ -12,7 +12,6 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 xfs-data-partition = true
 uefi-secure-boot = true
 systemd-networkd = true

diff --git a/variants/vmware-k8s-1.26/Cargo.toml b/variants/vmware-k8s-1.26/Cargo.toml
@@ -14,7 +14,6 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 
 [package.metadata.build-variant]
 image-format = "vmdk"

diff --git a/variants/vmware-k8s-1.27/Cargo.toml b/variants/vmware-k8s-1.27/Cargo.toml
@@ -14,7 +14,6 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 
 [package.metadata.build-variant]
 image-format = "vmdk"

diff --git a/variants/vmware-k8s-1.28/Cargo.toml b/variants/vmware-k8s-1.28/Cargo.toml
@@ -14,7 +14,6 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 uefi-secure-boot = true
 xfs-data-partition = true
 systemd-networkd = true

diff --git a/variants/vmware-k8s-1.29/Cargo.toml b/variants/vmware-k8s-1.29/Cargo.toml
@@ -14,7 +14,6 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 uefi-secure-boot = true
 xfs-data-partition = true
 systemd-networkd = true

diff --git a/variants/vmware-k8s-1.30/Cargo.toml b/variants/vmware-k8s-1.30/Cargo.toml
@@ -14,7 +14,6 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
-unified-cgroup-hierarchy = true
 uefi-secure-boot = true
 xfs-data-partition = true
 systemd-networkd = true