Drop scriptlet to tweak nss-resolve config
This was added in da15385b06
, 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.
This commit is contained in:
parent
b3c65ffbe3
commit
cda71799e7
@ -548,12 +548,6 @@ if [ -f /etc/nsswitch.conf ] ; then
|
|||||||
s/[[:blank:]]*$/ myhostname/
|
s/[[:blank:]]*$/ myhostname/
|
||||||
' /etc/nsswitch.conf &>/dev/null || :
|
' /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
|
# Add nss-systemd to passwd and group
|
||||||
grep -E -q '^(passwd|group):.* systemd' /etc/nsswitch.conf ||
|
grep -E -q '^(passwd|group):.* systemd' /etc/nsswitch.conf ||
|
||||||
sed -i.bak -r -e '
|
sed -i.bak -r -e '
|
||||||
|
Loading…
Reference in New Issue
Block a user