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

Move nss-myhostname before nss-mdns4

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-03-26 17:51:05 +01:00
parent d6a1608082
commit 310b8e6c95
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
systemd.spec
View File

@ -811,10 +811,16 @@ function mod_nss() {
' "$1" &>/dev/null || : ' "$1" &>/dev/null || :
# Add nss-resolve to hosts # Add nss-resolve to hosts
grep -E -q '^hosts:.* resolve' "$1" || if grep -E -q '^hosts:.* resolve' "$1"; then
sed -i.bak -r -e ' sed -i.bak -r -e '
s/^(hosts):(.*) files( mdns4_minimal .NOTFOUND=return.)? dns myhostname/\1:\2 files\3 resolve [!UNAVAIL=return] myhostname dns/ s/^(hosts):(.*) files( .*) myhostname dns/\1:\2 files myhostname\3 dns/
' "$1" &>/dev/null || : ' "$1" &>/dev/null || :
else
sed -i.bak -r -e '
s/^(hosts):(.*) files( mdns4_minimal .NOTFOUND=return.)? dns myhostname/\1:\2 files myhostname\3 resolve [!UNAVAIL=return] dns/
' "$1" &>/dev/null || :
fi
fi fi
} }
@ -984,6 +990,7 @@ fi
* Fri Mar 26 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 248~rc4-5 * Fri Mar 26 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 248~rc4-5
- Do not preset systemd-networkd.service and systemd-networkd-wait-online.service - Do not preset systemd-networkd.service and systemd-networkd-wait-online.service
on upgrades from before systemd-networkd was split out (#1943263) on upgrades from before systemd-networkd was split out (#1943263)
- In nsswitch.conf, move nss-myhostname to the front, before nss-mdns4 (#1943199)
* Wed Mar 24 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 248~rc4-4 * Wed Mar 24 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 248~rc4-4
- Revert patch that seems to cause problems with dns resolution - Revert patch that seems to cause problems with dns resolution