From 7cd4e9fd77685301b37a4e22eae17fe16466d383 Mon Sep 17 00:00:00 2001 From: licunlong Date: Wed, 1 Dec 2021 17:30:15 +0800 Subject: [PATCH] disable systemd-{timesyncd, networkd, resolved, homed, userdbd, pstore} by default --- ...timesyncd-networkd-resolved-homed-us.patch | 40 +++++++++++++++++++ systemd.spec | 13 ++++-- 2 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 disable-systemd-timesyncd-networkd-resolved-homed-us.patch diff --git a/disable-systemd-timesyncd-networkd-resolved-homed-us.patch b/disable-systemd-timesyncd-networkd-resolved-homed-us.patch new file mode 100644 index 0000000..ffa72fa --- /dev/null +++ b/disable-systemd-timesyncd-networkd-resolved-homed-us.patch @@ -0,0 +1,40 @@ +From 72e9c079d0fd769d1bdb7d7db9c49454ce4bd255 Mon Sep 17 00:00:00 2001 +From: licunlong +Date: Wed, 1 Dec 2021 17:27:07 +0800 +Subject: [PATCH] disable systemd-{timesyncd, networkd, resolved, homed, + userdbd, pstore} by default + +--- + presets/90-systemd.preset | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset +index d260874..2a7396c 100644 +--- a/presets/90-systemd.preset ++++ b/presets/90-systemd.preset +@@ -16,12 +16,6 @@ enable remote-cryptsetup.target + enable machines.target + + enable getty@.service +-enable systemd-timesyncd.service +-enable systemd-networkd.service +-enable systemd-resolved.service +-enable systemd-homed.service +-enable systemd-userdbd.socket +-enable systemd-pstore.service + + disable console-getty.service + disable debug-shell.service +@@ -44,3 +38,9 @@ disable syslog.socket + disable systemd-journal-gatewayd.* + disable systemd-journal-remote.* + disable systemd-journal-upload.* ++disable systemd-timesyncd.service ++denable systemd-networkd.service ++denable systemd-resolved.service ++denable systemd-homed.service ++denable systemd-userdbd.socket ++denable systemd-pstore.service +-- +2.23.0 + diff --git a/systemd.spec b/systemd.spec index 3b01cab..8046c7b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -20,7 +20,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 248 -Release: 13 +Release: 14 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -68,8 +68,10 @@ Patch0019: 0019-journald-enforce-longer-line-length-limit-during-set.patch Patch0020: 0020-fix-CVE-2021-33910.patch Patch0021: backport-core-fix-free-undefined-pointer-when-strdup-failed-i.patch +#openEuler +Patch9000: disable-systemd-timesyncd-networkd-resolved-homed-us.patch -BuildRequires: gcc, gcc-c++ +BuildRequires: gcc, gcc-c++, rsync BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel BuildRequires: audit-libs-devel, cryptsetup-devel, dbus-devel, libacl-devel BuildRequires: gobject-introspection-devel, libblkid-devel, xz-devel, xz @@ -1552,6 +1554,9 @@ fi %exclude /usr/share/man/man3/* %changelog +* Wed Dec 01 2021 licunlong - 248-14 +- disable systemd-{timesyncd, networkd, resolved} by default + * Thu Sep 16 2021 ExtinctFire - 248-13 - core: fix free undefined pointer when strdup failed in the first loop @@ -1570,10 +1575,10 @@ fi * Mon Aug 16 2021 yangmingtai - 248-8 - udev: exec daemon-reload after installation -* Thu Jun 03 2021 yangmingtai - 248-7 +* Thu Jul 22 2021 yangmingtai - 248-7 - fix CVE-2021-33910 -* Thu Jul 22 2021 shenyangyang - 248-6 +* Thu Jun 03 2021 shenyangyang - 248-6 - change requires to openssl-libs as post scripts systemctl requires libssl.so.1.1 * Mon May 31 2021 hexiaowen - 248-5