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

Fix logic in %posttrans for systemd-resolved

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-04-22 18:13:29 +02:00
parent a3b0ac6518
commit 893419015c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
systemd.spec
View File

@ -939,9 +939,14 @@ fi
%systemd_post systemd-resolved.service
mkdir -p %{_localstatedir}/lib/rpm-state/systemd || :
: >%{_localstatedir}/lib/rpm-state/systemd/systemd-resolved-initial-installation || :
%posttrans resolved
[ $1 -eq 1 ] || exit 0
test -e %{_localstatedir}/lib/rpm-state/systemd/systemd-resolved-initial-installation || exit 0
# Initial installation
rm %{_localstatedir}/lib/rpm-state/systemd/systemd-resolved-initial-installation || :
rmdir %{_localstatedir}/lib/rpm-state/systemd || :
# Create /etc/resolv.conf symlink.
# We would also create it using tmpfiles, but let's do this here
@ -962,14 +967,16 @@ if systemctl -q is-enabled systemd-resolved.service &>/dev/null &&
! systemd-analyze cat-config systemd/resolved.conf 2>/dev/null |
grep -iqE '^DNSStubListener\s*=\s*(no?|false|0|off)\s*$'; then
if ! test -e /etc/resolv.conf; then
ln -sv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
if ! ls -h /etc/resolv.conf &>/dev/null; then
ln -sv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf || :
elif test -d /run/systemd/system/ &&
! mountpoint /etc/resolv.conf &>/dev/null; then
ln -fsv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
ln -fsv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf || :
fi
fi
exit 0
%global _docdir_fmt %{name}
%files -f %{name}.lang -f .file-list-rest