From cda71799e7045b0451b925d6081f36facd7753ea Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Nov 29 2018 13:36:25 +0000 Subject: Drop scriptlet to tweak nss-resolve config This was added in da15385b06ac718b6046fe9801d18a44f050c628, November 2016, after nss-resolve was modified to return a special value. When nss-resolve is added to new installations, it should be configured in this way already, and we shouldn't modify configuration. Let's drop this too. --- diff --git a/systemd.spec b/systemd.spec index 939abed..348b5f5 100644 --- a/systemd.spec +++ b/systemd.spec @@ -548,12 +548,6 @@ if [ -f /etc/nsswitch.conf ] ; then s/[[:blank:]]*$/ myhostname/ ' /etc/nsswitch.conf &>/dev/null || : - # Add [!UNAVAIL=return] after resolve - grep -E -q '^hosts:.*resolve[[:space:]]*($|[[:alpha:]])' /etc/nsswitch.conf && - sed -i.bak -e ' - /^hosts:/ { s/resolve/& [!UNAVAIL=return]/} - ' /etc/nsswitch.conf &>/dev/null || : - # Add nss-systemd to passwd and group grep -E -q '^(passwd|group):.* systemd' /etc/nsswitch.conf || sed -i.bak -r -e '