diff --git a/packages/systemd/bootconfig-unified-cgroup-hierarchy.conf b/packages/systemd/bootconfig-unified-cgroup-hierarchy.conf deleted file mode 100644 index 854630777af..00000000000 --- a/packages/systemd/bootconfig-unified-cgroup-hierarchy.conf +++ /dev/null @@ -1 +0,0 @@ -init.systemd.unified_cgroup_hierarchy = 1 diff --git a/packages/systemd/systemd.spec b/packages/systemd/systemd.spec index 129981f174b..e1360268af7 100644 --- a/packages/systemd/systemd.spec +++ b/packages/systemd/systemd.spec @@ -14,7 +14,6 @@ Source3: journald.conf Source4: issue Source5: systemd-journald.conf Source6: systemd-sysusers.conf -Source7: bootconfig-unified-cgroup-hierarchy.conf # Backport of upstream patches that make the netlink default timeout # configurable. Bottlerocket carries this patch and configures the timeout in @@ -103,10 +102,6 @@ Requires: %{_cross_os}libselinux Requires: %{_cross_os}libuuid Requires: %{_cross_os}libxcrypt -# Only require a cgroup hierarchy package when building an image, not -# for packages that need systemd-devel as a build dependency. -Requires: (%{name}(cgroup-hierarchy) if %{_cross_os}metadata) - %description %{summary}. @@ -135,24 +130,6 @@ Summary: Files for resolved %description resolved %{summary}. -%package hybrid-cgroup-hierarchy -Summary: No-op dependency for hybrid cgroup hierarchy -Provides: %{name}(cgroup-hierarchy) -Requires: (%{_cross_os}image-feature(no-unified-cgroup-hierarchy) and %{name}) -Conflicts: (%{_cross_os}image-feature(unified-cgroup-hierarchy) or %{name}-unified-cgroup-hierarchy) - -%description hybrid-cgroup-hierarchy -%{summary}. - -%package unified-cgroup-hierarchy -Summary: Bootconfig snippet for unified cgroup hierarchy -Provides: %{name}(cgroup-hierarchy) -Requires: (%{_cross_os}image-feature(unified-cgroup-hierarchy) and %{name}) -Conflicts: (%{_cross_os}image-feature(no-unified-cgroup-hierarchy) or %{name}-hybrid-cgroup-hierarchy) - -%description unified-cgroup-hierarchy -%{summary}. - %prep %autosetup -n systemd-stable-%{version} -p1 @@ -227,7 +204,7 @@ CONFIGURE_OPTS=( -Dpkgconfigdatadir='%{_cross_pkgconfigdir}' -Dpkgconfiglibdir='%{_cross_pkgconfigdir}' - -Ddefault-hierarchy=hybrid + -Ddefault-hierarchy=unified -Dadm-group=false -Dwheel-group=false @@ -340,9 +317,6 @@ rm -f %{buildroot}%{_cross_libdir}/systemd/{system,user}/graphical.target install -d %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir} install -p -m 0644 %{S:4} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/issue -install -d %{buildroot}%{_cross_bootconfigdir} -install -p -m 0644 %{S:7} %{buildroot}%{_cross_bootconfigdir}/10-unified-cgroup-hierarchy.conf - %files %license LICENSE.GPL2 LICENSE.LGPL2.1 %{_cross_attribution_file} @@ -531,9 +505,4 @@ install -p -m 0644 %{S:7} %{buildroot}%{_cross_bootconfigdir}/10-unified-cgroup- %exclude %{_cross_bindir}/systemd-resolve %exclude %{_cross_sbindir}/resolvconf -%files hybrid-cgroup-hierarchy - -%files unified-cgroup-hierarchy -%{_cross_bootconfigdir}/10-unified-cgroup-hierarchy.conf - %changelog diff --git a/variants/aws-dev/Cargo.toml b/variants/aws-dev/Cargo.toml index bfa9456c43c..18be1a56817 100644 --- 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-1-nvidia/Cargo.toml b/variants/aws-ecs-1-nvidia/Cargo.toml index 015f348d414..9b742524e94 100644 --- a/variants/aws-ecs-1-nvidia/Cargo.toml +++ b/variants/aws-ecs-1-nvidia/Cargo.toml @@ -14,6 +14,7 @@ kernel-parameters = [ "console=ttyS0,115200n8", "net.ifnames=0", "netdog.default-interface=eth0:dhcp4,dhcp6?", + "systemd.unified_cgroup_hierarchy=0", "quiet", ] included-packages = [ diff --git a/variants/aws-ecs-1/Cargo.toml b/variants/aws-ecs-1/Cargo.toml index 3d53e68b097..e7dd3e181b4 100644 --- a/variants/aws-ecs-1/Cargo.toml +++ b/variants/aws-ecs-1/Cargo.toml @@ -11,6 +11,7 @@ kernel-parameters = [ "console=ttyS0,115200n8", "net.ifnames=0", "netdog.default-interface=eth0:dhcp4,dhcp6?", + "systemd.unified_cgroup_hierarchy=0", "quiet", ] included-packages = [ diff --git a/variants/aws-ecs-2-nvidia/Cargo.toml b/variants/aws-ecs-2-nvidia/Cargo.toml index 2ace1284361..2ea13049f3e 100644 --- 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 index d307bb3abc5..282dcc269cc 100644 --- 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.23-nvidia/Cargo.toml b/variants/aws-k8s-1.23-nvidia/Cargo.toml index 71dad8886d4..0606369024a 100644 --- a/variants/aws-k8s-1.23-nvidia/Cargo.toml +++ b/variants/aws-k8s-1.23-nvidia/Cargo.toml @@ -32,6 +32,7 @@ kernel-parameters = [ "console=ttyS0,115200n8", "net.ifnames=0", "netdog.default-interface=eth0:dhcp4,dhcp6?", + "systemd.unified_cgroup_hierarchy=0", "quiet", ] diff --git a/variants/aws-k8s-1.23/Cargo.toml b/variants/aws-k8s-1.23/Cargo.toml index 60cb5dbbf8e..44585fc0a39 100644 --- a/variants/aws-k8s-1.23/Cargo.toml +++ b/variants/aws-k8s-1.23/Cargo.toml @@ -26,6 +26,7 @@ kernel-parameters = [ "console=ttyS0,115200n8", "net.ifnames=0", "netdog.default-interface=eth0:dhcp4,dhcp6?", + "systemd.unified_cgroup_hierarchy=0", "quiet", ] diff --git a/variants/aws-k8s-1.24-nvidia/Cargo.toml b/variants/aws-k8s-1.24-nvidia/Cargo.toml index 6f3bc8a1233..e7f011674d6 100644 --- a/variants/aws-k8s-1.24-nvidia/Cargo.toml +++ b/variants/aws-k8s-1.24-nvidia/Cargo.toml @@ -32,6 +32,7 @@ kernel-parameters = [ "console=ttyS0,115200n8", "net.ifnames=0", "netdog.default-interface=eth0:dhcp4,dhcp6?", + "systemd.unified_cgroup_hierarchy=0", "quiet", ] diff --git a/variants/aws-k8s-1.24/Cargo.toml b/variants/aws-k8s-1.24/Cargo.toml index 8d9298896a0..1f5676fd42a 100644 --- a/variants/aws-k8s-1.24/Cargo.toml +++ b/variants/aws-k8s-1.24/Cargo.toml @@ -26,6 +26,7 @@ kernel-parameters = [ "console=ttyS0,115200n8", "net.ifnames=0", "netdog.default-interface=eth0:dhcp4,dhcp6?", + "systemd.unified_cgroup_hierarchy=0", "quiet", ] diff --git a/variants/aws-k8s-1.25-nvidia/Cargo.toml b/variants/aws-k8s-1.25-nvidia/Cargo.toml index 9e59896d1a8..2692d7547d5 100644 --- a/variants/aws-k8s-1.25-nvidia/Cargo.toml +++ b/variants/aws-k8s-1.25-nvidia/Cargo.toml @@ -32,6 +32,7 @@ kernel-parameters = [ "console=ttyS0,115200n8", "net.ifnames=0", "netdog.default-interface=eth0:dhcp4,dhcp6?", + "systemd.unified_cgroup_hierarchy=0", "quiet", ] diff --git a/variants/aws-k8s-1.25/Cargo.toml b/variants/aws-k8s-1.25/Cargo.toml index 4eeb4a2614c..79e3b847b34 100644 --- a/variants/aws-k8s-1.25/Cargo.toml +++ b/variants/aws-k8s-1.25/Cargo.toml @@ -26,6 +26,7 @@ kernel-parameters = [ "console=ttyS0,115200n8", "net.ifnames=0", "netdog.default-interface=eth0:dhcp4,dhcp6?", + "systemd.unified_cgroup_hierarchy=0", "quiet", ] diff --git a/variants/aws-k8s-1.26-nvidia/Cargo.toml b/variants/aws-k8s-1.26-nvidia/Cargo.toml index dadd6b69c54..09a51896975 100644 --- 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 index fc9ec230f3e..e24b4c22c2f 100644 --- 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 index f15ab848b62..f1d65ba7a07 100644 --- 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 index eff3ed053f6..c95f1cbdfda 100644 --- 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 index 4a740cef9c2..33c4908b960 100644 --- 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 index 676cd9a428b..baacf5eb101 100644 --- 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 index 7c68653464d..d47f1a03c16 100644 --- 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 index 84dbe5be152..f229776ebc5 100644 --- 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 index 3752534ebd1..a6a382c7775 100644 --- 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 index 7016ede61a2..02dfe30e7d3 100644 --- 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 index 553d40f28bd..414862ce3e6 100644 --- 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 index bd0dbe73062..a29d26aa591 100644 --- 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 index 8dc5db6c317..81694d39c68 100644 --- 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 index d299e0252ee..1f938e4ae07 100644 --- 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 index 467e223fbad..fe2a84c733b 100644 --- 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 index 2dec382d40f..e5d56884237 100644 --- 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 index 12e825e93c4..ee6fa75ce5b 100644 --- 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 index df957f6dade..52c262b3964 100644 --- 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 index b0bae19e4b3..bbf4aed4788 100644 --- 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 index 71fa80abb92..dd5fa5392f3 100644 --- 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 index 78d49faf338..814d6fa1680 100644 --- 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