From 882fa52dc130b228070638fa116342da85d1e107 Mon Sep 17 00:00:00 2001 From: autodist Date: Sat, 30 Dec 2023 11:39:57 +0100 Subject: [PATCH] Release 248-4mamba --- systemd.spec | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/systemd.spec b/systemd.spec index cd4a4fa..ddade66 100644 --- a/systemd.spec +++ b/systemd.spec @@ -27,7 +27,7 @@ Name: systemd Epoch: 2 Version: 248 -Release: 3mamba +Release: 4mamba Summary: A system and service manager compatible with SysV and LSB init scripts Group: System/Configuration Vendor: openmamba @@ -395,18 +395,8 @@ fi if [ $1 -eq 1 ]; then systemctl preset-all &>/dev/null || : systemctl --global preset-all &>/dev/null || : - # From Fedora: - # 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 - # does not do this, because it's marked with ! and we don't specify --boot.) - if test -d /run/systemd/system/ && - systemctl -q is-enabled systemd-resolved.service &>/dev/null && - ! mountpoint /etc/resolv.conf &>/dev/null && - ! systemd-analyze cat-config systemd/resolved.conf 2>/dev/null | \ - grep -qE '^DNSStubListener\s*=\s*([nN][oO]?|[fF]|[fF][aA][lL][sS][eE]|0|[oO][fF][fF])$'; then - ln -fsv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf - fi + # Create /etc/resolv.conf symlink. + ln -fsv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf fi : @@ -500,6 +490,7 @@ if [ $1 -ge 1 ]; then } # Add if missing for safety [ -e /lib/systemd ] || ln -s ../usr/lib/systemd /lib/systemd +[ -e /etc/resolv.conf ] || ln -fsv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf systemctl --no-reload preset systemd-timesyncd # remove broken left sysv5 symlink due to migrating services to systemd @@ -850,6 +841,9 @@ systemctl daemon-reload &>/dev/null || : %{_libdir}/pkgconfig/libudev.pc %changelog +* Sat Apr 24 2021 Silvan Calarco 248-4mamba +- make sure /etc/resolv.conf link is created on first install + * Thu Apr 22 2021 Silvan Calarco 248-3mamba - enable systemd-resolved and create /etc/resolve.conf as symlink