diff --git a/backport-login-drop-non-default-value-for-RuntimeDirectoryIno.patch b/backport-login-drop-non-default-value-for-RuntimeDirectoryIno.patch new file mode 100644 index 0000000..118b7d7 --- /dev/null +++ b/backport-login-drop-non-default-value-for-RuntimeDirectoryIno.patch @@ -0,0 +1,26 @@ +From 0bc055cf52251a98e41391a7587b7222120c67d2 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Thu, 28 Apr 2022 19:53:12 +0900 +Subject: [PATCH] login: drop non-default value for +RuntimeDirectoryInodesMax= + +--- + src/login/logind.conf.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/login/logind.conf.in b/src/login/logind.conf.in +index 3c2ae4b..cc6f6c9 100644 +--- a/src/login/logind.conf.in ++++ b/src/login/logind.conf.in +@@ -38,7 +38,7 @@ + #IdleAction=ignore + #IdleActionSec=30min + #RuntimeDirectorySize=10% +-#RuntimeDirectoryInodesMax=400k ++#RuntimeDirectoryInodesMax= + #RemoveIPC=no + #InhibitorsMax=8192 + #SessionsMax=8192 +-- +2.27.0 + diff --git a/change-NTP-server-to-x.pool.ntp.org.patch b/change-NTP-server-to-x.pool.ntp.org.patch new file mode 100644 index 0000000..33798fd --- /dev/null +++ b/change-NTP-server-to-x.pool.ntp.org.patch @@ -0,0 +1,25 @@ +From bdf0536bace233a0da7e1ff094c8cb81ded18c38 Mon Sep 17 00:00:00 2001 +From: licunlong +Date: Tue, 23 Feb 2021 15:07:17 +0800 +Subject: [PATCH] change NTP server to x.pool.ntp.org + +--- + meson_options.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson_options.txt b/meson_options.txt +index 163c8df..ba7adf9 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -312,7 +312,7 @@ option('dns-servers', type : 'string', + value : '1.1.1.1#cloudflare-dns.com 8.8.8.8#dns.google 1.0.0.1#cloudflare-dns.com 8.8.4.4#dns.google 2606:4700:4700::1111#cloudflare-dns.com 2001:4860:4860::8888#dns.google 2606:4700:4700::1001#cloudflare-dns.com 2001:4860:4860::8844#dns.google') + option('ntp-servers', type : 'string', + description : 'space-separated list of default NTP servers', +- value : 'time1.google.com time2.google.com time3.google.com time4.google.com') ++ value : '0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org') + option('support-url', type : 'string', + description : 'the support URL to show in catalog entries included in systemd', + value : 'https://lists.freedesktop.org/mailman/listinfo/systemd-devel') +-- +2.27.0 + diff --git a/systemd.spec b/systemd.spec index 44cac02..ccd452a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -20,7 +20,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 249 -Release: 36 +Release: 37 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -75,6 +75,7 @@ Patch0026: print-the-real-reason-for-link-update.patch Patch0027: core-skip-change-device-to-dead-in-manager_catchup-d.patch Patch0028: revert-rpm-restart-services-in-posttrans.patch Patch0029: Don-t-set-AlternativeNamesPolicy-by-default.patch +Patch0030: change-NTP-server-to-x.pool.ntp.org.patch #backport Patch6000: backport-core-fix-free-undefined-pointer-when-strdup-failed-i.patch @@ -112,6 +113,7 @@ Patch6031: backport-journal-Only-move-to-objects-when-necessary.patch Patch6032: backport-scsi_id-retry-inquiry-ioctl-if-host_byte-is-DID_TRAN.patch Patch6033: backport-revert-units-add-ProtectClock-yes.patch Patch6034: backport-revert-delete-initrd-usr-fs-target.patch +Patch6037: backport-login-drop-non-default-value-for-RuntimeDirectoryIno.patch BuildRequires: gcc, gcc-c++ BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel @@ -1514,6 +1516,10 @@ fi %{_libdir}/security/pam_systemd.so %changelog +* Thu Sep 29 2022 yangmingtai -249-37 +- 1.change default ntp server + 2.correct the default value of RuntimeDirectoryInodesMax + * Fri Sep 16 2022 yangmingtai -249-36 - revert:delete the initrd-usr-fs.target