rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Disable resolved cache via config snippet (#1940715)

Browse Source
This commit is contained in:
Adam Williamson 2021-03-12 17:46:46 -08:00
parent 98c9d9f8c5
commit 58e51a6f6e
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nocache.conf Normal file
View File

@ -0,0 +1,2 @@
[Resolve]
Cache=no

11
systemd.spec
View File

@ -21,7 +21,7 @@
Name: systemd Name: systemd
Url: https://www.freedesktop.org/wiki/Software/systemd Url: https://www.freedesktop.org/wiki/Software/systemd
Version: 248~rc4 Version: 248~rc4
Release: 1%{?dist} Release: 2%{?dist}
# For a breakdown of the licensing, see README # For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+ License: LGPLv2+ and MIT and GPLv2+
Summary: System and Service Manager Summary: System and Service Manager
@ -64,6 +64,9 @@ Source22: sysusers.attr
Source23: sysusers.prov Source23: sysusers.prov
Source24: sysusers.generate-pre.sh Source24: sysusers.generate-pre.sh
# Disable resolved caching to workaround #1933433
Source100: nocache.conf
%if 0 %if 0
GIT_DIR=../../src/systemd/.git git format-patch-ab --no-signature -M -N v235..v235-stable GIT_DIR=../../src/systemd/.git git format-patch-ab --no-signature -M -N v235..v235-stable
i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done|xclip i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done|xclip
@ -554,6 +557,9 @@ touch %{buildroot}%{_localstatedir}/lib/private/systemd/journal-upload/state
# Install yum protection fragment # Install yum protection fragment
install -Dm0644 %{SOURCE4} %{buildroot}/etc/dnf/protected.d/systemd.conf install -Dm0644 %{SOURCE4} %{buildroot}/etc/dnf/protected.d/systemd.conf
# Install resolved cache disable fragment
install -Dm0644 -t %{buildroot}%{pkgdir}/resolved.conf.d %{SOURCE100}
install -Dm0644 -t %{buildroot}/usr/lib/firewalld/services/ %{SOURCE7} %{SOURCE8} install -Dm0644 -t %{buildroot}/usr/lib/firewalld/services/ %{SOURCE7} %{SOURCE8}
# Restore systemd-user pam config from before "removal of Fedora-specific bits" # Restore systemd-user pam config from before "removal of Fedora-specific bits"
@ -949,6 +955,9 @@ getent passwd systemd-network &>/dev/null || useradd -r -u 192 -l -g systemd-net
%files standalone-sysusers -f .file-list-standalone-sysusers %files standalone-sysusers -f .file-list-standalone-sysusers
%changelog %changelog
* Fri Mar 19 2021 Adam Williamson <awilliam@redhat.com> - 248~rc4-2
- Disable resolved cache via config snippet (#1940715)
* Thu Mar 18 2021 Yu Watanabe <yuwatana@redhat.com> - 248~rc4-1 * Thu Mar 18 2021 Yu Watanabe <yuwatana@redhat.com> - 248~rc4-1
- Latest upstream prerelease, see - Latest upstream prerelease, see
https://github.com/systemd/systemd/blob/v248-rc4/NEWS. https://github.com/systemd/systemd/blob/v248-rc4/NEWS.