From b3c65ffbe3b9051e9129050c497afc144cd64508 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Nov 29 2018 13:33:11 +0000 Subject: Drop scriptlet to disable nss-mymachines The scriptlet to *add* it was removed in 38d93ea79fa660f17fae070125e0e72eeb50508c, November 2015. We only care about upgrades from previous two releases, so it is long overdue to remove this. --- diff --git a/systemd.spec b/systemd.spec index 42f7e2c..939abed 100644 --- a/systemd.spec +++ b/systemd.spec @@ -548,16 +548,6 @@ if [ -f /etc/nsswitch.conf ] ; then s/[[:blank:]]*$/ myhostname/ ' /etc/nsswitch.conf &>/dev/null || : - # remove mymachines from passwd and group lines of /etc/nsswitch.conf - # https://bugzilla.redhat.com/show_bug.cgi?id=1284325 - # https://meetbot.fedoraproject.org/fedora-meeting/2015-11-25/fesco.2015-11-25-18.00.html - # To avoid the removal, e.g. add a space at the end of the line. - grep -E -q '^(passwd|group):.* mymachines$' /etc/nsswitch.conf && - sed -i.bak -r -e ' - s/^(passwd:.*) mymachines$/\1/; - s/^(group:.*) mymachines$/\1/; - ' /etc/nsswitch.conf &>/dev/null || : - # Add [!UNAVAIL=return] after resolve grep -E -q '^hosts:.*resolve[[:space:]]*($|[[:alpha:]])' /etc/nsswitch.conf && sed -i.bak -e '