rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop scriptlet to disable nss-mymachines

Browse Source 
The scriptlet to *add* it was removed in 38d93ea79f,
November 2015. We only care about upgrades from previous two releases, so it is
long overdue to remove this.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-11-29 14:33:11 +01:00
parent 07e98bcf32
commit b3c65ffbe3
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
systemd.spec
View File

@ -548,16 +548,6 @@ if [ -f /etc/nsswitch.conf ] ; then
s/[[:blank:]]*$/ myhostname/ s/[[:blank:]]*$/ myhostname/
' /etc/nsswitch.conf &>/dev/null || : ' /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 # Add [!UNAVAIL=return] after resolve
grep -E -q '^hosts:.*resolve[[:space:]]*($|[[:alpha:]])' /etc/nsswitch.conf && grep -E -q '^hosts:.*resolve[[:space:]]*($|[[:alpha:]])' /etc/nsswitch.conf &&
sed -i.bak -e ' sed -i.bak -e '