Revert "Disabling systemd-oomd by default in Mariner (#4580)" (#4600)

This reverts commit 1e8d4d920a.
This commit is contained in:
SeanDougherty 2023-01-13 13:35:31 -08:00 коммит произвёл GitHub
Родитель 0c30868038
Коммит 7e81d545de
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 10 добавлений и 20 удалений

Просмотреть файл

@ -1,7 +1,7 @@
Summary: Bootstrap version of systemd. Workaround for systemd circular dependency.
Name: systemd-bootstrap
Version: 250.3
Release: 11%{?dist}
Release: 10%{?dist}
License: LGPLv2+ AND GPLv2+ AND MIT
Vendor: Microsoft Corporation
Distribution: Mariner
@ -151,8 +151,6 @@ 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
@ -243,9 +241,6 @@ fi
%{_datadir}/pkgconfig/udev.pc
%changelog
* Tue Jan 10 2023 Adit Jha <aditjha@microsoft.com> - 250.3-11
- Disabling systemd-oomd.service by default to keep systemctl status clean
* Wed Dec 14 2022 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 250.3-10
- Add patch for CVE-2022-45873

Просмотреть файл

@ -1,7 +1,7 @@
Summary: Systemd-250
Name: systemd
Version: 250.3
Release: 13%{?dist}
Release: 12%{?dist}
License: LGPLv2+ AND GPLv2+ AND MIT
Vendor: Microsoft Corporation
Distribution: Mariner
@ -179,8 +179,6 @@ 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
@ -273,9 +271,6 @@ fi
%files lang -f %{name}.lang
%changelog
* Tue Jan 10 2023 Adit Jha <aditjha@microsoft.com> - 250.3-13
- Disabling systemd-oomd.service by default to keep systemctl status clean
* Wed Dec 14 2022 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 250.3-12
- Add patch for CVE-2022-45873

Просмотреть файл

@ -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-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
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
tar-1.34-1.cm2.aarch64.rpm
tar-debuginfo-1.34-1.cm2.aarch64.rpm
tdnf-3.2.2-4.cm2.aarch64.rpm

Просмотреть файл

@ -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-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
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
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