diff --git a/systemd.spec b/systemd.spec index 9d57c74..6e43afc 100644 --- a/systemd.spec +++ b/systemd.spec @@ -31,11 +31,11 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd %if %{without inplace} Version: 250.2 -Release: 1%{?dist} +Release: 8%{?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/') -Release: 1 +Release: 8 %endif # For a breakdown of the licensing, see README @@ -728,6 +728,8 @@ meson test -C %{_vpath_builddir} -t 6 --print-errorlogs %include %{SOURCE1} %post +echo DDDDD START OF systemd POSTIN +echo DDDDD START OF systemd POSTIN >> /tmp/systemd-resolved.post.log systemd-machine-id-setup &>/dev/null || : # FIXME: move to %postun. We want to restart systemd *after* removing @@ -787,6 +789,8 @@ systemd-tmpfiles --create &>/dev/null || : # https://fedoraproject.org/wiki/Changes/Systemd_presets_for_user_units. systemctl preset-all &>/dev/null || : systemctl --global preset-all &>/dev/null || : +echo DDDDD END OF systemd POSTIN +echo DDDDD END OF systemd POSTIN >> /tmp/systemd-resolved.post.log %postun if [ $1 -eq 1 ]; then @@ -959,15 +963,25 @@ fi # (https://bugzilla.redhat.com/show_bug.cgi?id=1891847). # # Also don't create the symlink to the stub when the stub is disabled (#1891847 again). +echo DDDDD start of resolv.conf update +echo DDDDD start of resolv.conf update >> /tmp/systemd-resolved.post.log + +if systemctl -q is-enabled systemd-resolved.service; then + echo DDDDD systemd-resolved is really enabled +fi + 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 + echo DDDDD 2 >> /tmp/systemd-resolved.post.log if ! test -e /etc/resolv.conf; then ln -sv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf + echo DDDDD 3 >> /tmp/systemd-resolved.post.log elif test -d /run/systemd/system/ && ! mountpoint /etc/resolv.conf &>/dev/null; then ln -fsv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf + echo DDDDD 4 >> /tmp/systemd-resolved.post.log fi fi