!182 默认禁用systemd-{timesyncd, networkd, resolved}.service

From: @licunlong
Reviewed-by: @openeuler-basic
Signed-off-by: @openeuler-basic
This commit is contained in:
openeuler-ci-bot 2021-12-03 07:14:17 +00:00 committed by Gitee
commit 30a354cbd7
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,33 @@
From 8324f588b88566e077aae9b5814a4ee721f8368c Mon Sep 17 00:00:00 2001
From: licunlong <licunlong1@huawei.com>
Date: Wed, 1 Dec 2021 17:04:40 +0800
Subject: [PATCH] disable systemd-{timesyncd, networkd, resolved} by default
---
presets/90-systemd.preset | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
index 11960e5..b16164a 100644
--- a/presets/90-systemd.preset
+++ b/presets/90-systemd.preset
@@ -15,9 +15,6 @@ enable remote-cryptsetup.target
enable machines.target
enable getty@.service
-enable systemd-timesyncd.service
-enable systemd-networkd.service
-enable systemd-resolved.service
disable console-getty.service
disable debug-shell.service
@@ -34,3 +31,6 @@ disable syslog.socket
disable systemd-journal-gatewayd.*
disable systemd-journal-remote.*
disable systemd-journal-upload.*
+disable systemd-timesyncd.service
+disable systemd-networkd.service
+disable systemd-resolved.service
--
2.23.0

View File

@ -16,7 +16,7 @@
Name: systemd
Url: https://www.freedesktop.org/wiki/Software/systemd
Version: 243
Release: 48
Release: 49
License: MIT and LGPLv2+ and GPLv2+
Summary: System and Service Manager
@ -155,6 +155,7 @@ Patch9009: systemd-change-time-log-level.patch
Patch9010: fix-capsh-drop-but-ping-success.patch
Patch9011: 0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
Patch9012: set-kernel-core_pipe_limit-to-16.patch
Patch9013: disable-systemd-timesyncd-networkd-resolved-by-defau.patch
BuildRequires: gcc, gcc-c++
BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel
@ -1527,6 +1528,9 @@ fi
%exclude /usr/share/man/man3/*
%changelog
* Wed Dec 01 2021 licunlong <licunlong1@huawei.com> - 243-49
- disable systemd-{timesyncd, networkd, resolved} by default
* Thu Sep 28 2021 shenyangyang <shenyangyang4@huawei.com> - 243-48
- adapt to the new capsh format for test