rpms
/
systemd
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change dynamic stub target to make name resolution work in install %post

This commit is contained in:
Adam Williamson 2022-06-16 10:39:15 -07:00
parent 6b234deaf8
commit 34c1647bc3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
systemd.spec
View File

@ -31,7 +31,7 @@ Name: systemd
Url: https://www.freedesktop.org/wiki/Software/systemd
%if %{without inplace}
Version: 249.12
Release: 4%{?dist}
Release: 5%{?dist}
%else
# determine the build information from local checkout
Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
@ -974,12 +974,12 @@ if systemctl -q is-enabled systemd-resolved.service &>/dev/null &&
if ! ls -h /etc/resolv.conf &>/dev/null; then
mkdir -p /run/systemd/resolve &>/dev/null || :
ln -sv ../../../usr/lib/systemd/resolv.conf /run/systemd/resolve/stub-resolv.conf &>/dev/null || :
ln -sv resolv.conf /run/systemd/resolve/stub-resolv.conf &>/dev/null || :
ln -sv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf &>/dev/null || :
elif test -d /run/systemd/system/ &&
! mountpoint /etc/resolv.conf &>/dev/null; then
mkdir -p /run/systemd/resolve &>/dev/null || :
ln -sv ../../../usr/lib/systemd/resolv.conf /run/systemd/resolve/stub-resolv.conf &>/dev/null || :
ln -sv resolv.conf /run/systemd/resolve/stub-resolv.conf &>/dev/null || :
ln -fsv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf &>/dev/null || :
fi
fi
@ -1039,8 +1039,11 @@ exit 0
%files standalone-sysusers -f .file-list-standalone-sysusers
%changelog
* Thu Jun 16 2022 Adam Williamson <awilliam@redhat.com> - 249.12-5
- Change dynamic stub target to make name resolution work in install %post (#2074083)
* Fri Jun 10 2022 Adam Williamson <awilliam@redhat.com> - 249.12-4
- Create empty stub for resolv.conf symlink if it doesn't exist (#2074083)
- Link dynamic to static stub for resolv.conf symlink if it doesn't exist (#2074083)
* Fri Apr 29 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 249.12-3
- Link /etc/resolv.conf to /usr/lib/systemd/resolv.conf (#2074083)