Force creation of /etc/resolv.conf symlink during installation

https://bugzilla.redhat.com/show_bug.cgi?id=1873856#c14

systemd.spec

@@ -20,7 +20,7 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 Version:        246.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        System and Service Manager
@@ -602,12 +602,12 @@ setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal/ &>/de
 
 [ $1 -eq 1 ] || exit 0
 
-# Create /etc/resolv.conf symlink
-# We would also create it using tmpfiles, but let's do this here too
-# before NetworkManager gets a chance. (systemd-tmpfiles invocation above
+# Create /etc/resolv.conf symlink.
+# We would also create it using tmpfiles, but let's do this here unconditionally
+# too before NetworkManager gets a chance. (systemd-tmpfiles invocation above
 # does not do this, because it's marked with ! and we don't specify --boot.)
 # https://bugzilla.redhat.com/show_bug.cgi?id=1873856
-ln -sv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
+ln -fsv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
 
 # We reset the enablement of all services upon initial installation
 # https://bugzilla.redhat.com/show_bug.cgi?id=1118740#c23
@@ -804,6 +804,10 @@ fi
 %files tests -f .file-list-tests
 
 %changelog
+* Sun Sep 13 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 246.4-2
+- Also remove existing file when creating /etc/resolv.conf symlink
+  upon installation (#1873856 again)
+
 * Wed Sep  2 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 246.4-1
 - Update to latest stable version: a rework of how the unit cache mtime works
   (hopefully #1872068, #1871327, #1867930), plus various fixes to