diff --git a/SPECS/systemd/systemd-bootstrap.spec b/SPECS/systemd/systemd-bootstrap.spec index 898982b2a5..533df058b3 100644 --- a/SPECS/systemd/systemd-bootstrap.spec +++ b/SPECS/systemd/systemd-bootstrap.spec @@ -1,7 +1,7 @@ Summary: Bootstrap version of systemd. Workaround for systemd circular dependency. Name: systemd-bootstrap Version: 250.3 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2+ AND GPLv2+ AND MIT Vendor: Microsoft Corporation Distribution: Mariner @@ -151,6 +151,8 @@ install -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/systemd/network # to enable/disable services should succeed. if [ $1 -eq 1 ]; then systemctl preset-all + systemctl disable --now systemd-oomd + systemctl mask systemd-oomd fi %postun -p /sbin/ldconfig @@ -241,6 +243,9 @@ fi %{_datadir}/pkgconfig/udev.pc %changelog +* Tue Jan 10 2023 Adit Jha - 250.3-11 +- Disabling systemd-oomd.service by default to keep systemctl status clean + * Wed Dec 14 2022 CBL-Mariner Servicing Account - 250.3-10 - Add patch for CVE-2022-45873 diff --git a/SPECS/systemd/systemd.spec b/SPECS/systemd/systemd.spec index c4a36d2ff5..4a431246c3 100644 --- a/SPECS/systemd/systemd.spec +++ b/SPECS/systemd/systemd.spec @@ -1,7 +1,7 @@ Summary: Systemd-250 Name: systemd Version: 250.3 -Release: 12%{?dist} +Release: 13%{?dist} License: LGPLv2+ AND GPLv2+ AND MIT Vendor: Microsoft Corporation Distribution: Mariner @@ -179,6 +179,8 @@ meson test -C build # to enable/disable services should succeed. if [ $1 -eq 1 ]; then systemctl preset-all + systemctl disable --now systemd-oomd + systemctl mask systemd-oomd fi %postun -p /sbin/ldconfig @@ -271,6 +273,9 @@ fi %files lang -f %{name}.lang %changelog +* Tue Jan 10 2023 Adit Jha - 250.3-13 +- Disabling systemd-oomd.service by default to keep systemctl status clean + * Wed Dec 14 2022 CBL-Mariner Servicing Account - 250.3-12 - Add patch for CVE-2022-45873 diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 2a921f2244..460fafb44e 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -548,10 +548,10 @@ sqlite-devel-3.39.2-2.cm2.aarch64.rpm sqlite-libs-3.39.2-2.cm2.aarch64.rpm swig-4.0.2-3.cm2.aarch64.rpm swig-debuginfo-4.0.2-3.cm2.aarch64.rpm -systemd-bootstrap-250.3-10.cm2.aarch64.rpm -systemd-bootstrap-debuginfo-250.3-10.cm2.aarch64.rpm -systemd-bootstrap-devel-250.3-10.cm2.aarch64.rpm -systemd-bootstrap-rpm-macros-250.3-10.cm2.noarch.rpm +systemd-bootstrap-250.3-11.cm2.aarch64.rpm +systemd-bootstrap-debuginfo-250.3-11.cm2.aarch64.rpm +systemd-bootstrap-devel-250.3-11.cm2.aarch64.rpm +systemd-bootstrap-rpm-macros-250.3-11.cm2.noarch.rpm tar-1.34-1.cm2.aarch64.rpm tar-debuginfo-1.34-1.cm2.aarch64.rpm tdnf-3.2.2-4.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index fbcced5a5b..3119ede1a8 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -548,10 +548,10 @@ sqlite-devel-3.39.2-2.cm2.x86_64.rpm sqlite-libs-3.39.2-2.cm2.x86_64.rpm swig-4.0.2-3.cm2.x86_64.rpm swig-debuginfo-4.0.2-3.cm2.x86_64.rpm -systemd-bootstrap-250.3-10.cm2.x86_64.rpm -systemd-bootstrap-debuginfo-250.3-10.cm2.x86_64.rpm -systemd-bootstrap-devel-250.3-10.cm2.x86_64.rpm -systemd-bootstrap-rpm-macros-250.3-10.cm2.noarch.rpm +systemd-bootstrap-250.3-11.cm2.x86_64.rpm +systemd-bootstrap-debuginfo-250.3-11.cm2.x86_64.rpm +systemd-bootstrap-devel-250.3-11.cm2.x86_64.rpm +systemd-bootstrap-rpm-macros-250.3-11.cm2.noarch.rpm tar-1.34-1.cm2.x86_64.rpm tar-debuginfo-1.34-1.cm2.x86_64.rpm tdnf-3.2.2-4.cm2.x86_64.rpm