keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net, net-dns: don't spam lo iface

Browse Source 
Putting any configuration into /etc/net/ifaces/lo/resolv.conf
makes etcnet *overwrite* /etc/resolv.conf, while putting that
into /etc/resolv.conf itself makes e.g. vzctl --nameserver
*append* to what's been specified.

Reported-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
This commit is contained in:
Michael Shigorin 2018-02-19 12:51:46 +03:00
parent d5f71b3716
commit 1c4a7bd5dd
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
features.in/net-dns/rootfs/image-scripts.d/60-net-dns
View File

@ -1,3 +1,17 @@
#!/bin/sh
# set default nameserver, if any
for i in $GLOBAL_NAMESERVERS; do echo "nameserver $i"; done >> /etc/resolv.conf
if [ $GLOBAL_NAMESERVERS = "example" ]; then
echo "# yandex"
echo "#nameserver 77.88.8.1"
echo "# google"
echo "#nameserver 8.8.8.8"
echo "# level3"
echo "#nameserver 4.2.2.1"
echo "#nameserver 4.2.2.2"
echo "#nameserver 4.2.2.3"
else
for i in $GLOBAL_NAMESERVERS; do
echo "nameserver $i"
done
fi >> /etc/resolv.conf

17
features.in/net/rootfs/image-scripts.d/50-net-resolv
View File

@ -1,19 +1,8 @@
#!/bin/sh
# see also net-dns feature for actual nameserver control
# offer some convenient servers for static configuration cases
# (see also net-dns feature)
if [ -d /etc/net/ifaces/lo ]; then
{
echo "# yandex"
echo "#nameserver 77.88.8.1"
echo "# google"
echo "#nameserver 8.8.8.8"
echo "# level3"
echo "#nameserver 4.2.2.1"
echo "#nameserver 4.2.2.2"
echo "#nameserver 4.2.2.3"
} >> /etc/net/ifaces/lo/resolv.conf
fi
# purge hasher-provided files potentially disclosing
# build host's network configuration bits
find /var -name resolv.conf -or -name nsswitch.conf -delete
# hasher might have carried host /etc/hosts over, need to overwrite