Skip to content

M
mkimage-profiles
Commit 7459a74a authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

net: adjust accordingly

Refer to net-dns feature where appropriate (it actually started out as an extension of net feature but the reasons to separate it quickly became apparent to me).
parent e4bd17cc
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
features.in/net/config.mk
View file @ 7459a74a
...@@ -31,4 +31,4 @@ use/net/connman: use/net ...@@ -31,4 +31,4 @@ use/net/connman: use/net
use/net/networkd: use/net use/net/networkd: use/net
@$(call add,THE_PACKAGES,systemd-networkd) @$(call add,THE_PACKAGES,systemd-networkd)
@$(call add,DEFAULT_SERVICES_ENABLE,systemd-networkd) @$(call add,DEFAULT_SERVICES_ENABLE,systemd-networkd)
\ No newline at end of file
features.in/net/rootfs/image-scripts.d/50-net-resolv
View file @ 7459a74a
#!/bin/sh #!/bin/sh
# offer some convenient servers for static configuration cases # offer some convenient servers for static configuration cases
# (see also net-dns feature)
if [ -d /etc/net/ifaces/lo ]; then if [ -d /etc/net/ifaces/lo ]; then
{ {
echo "# yandex" echo "# yandex"
...@@ -17,3 +18,4 @@ find /var -name resolv.conf -or -name nsswitch.conf -delete ...@@ -17,3 +18,4 @@ find /var -name resolv.conf -or -name nsswitch.conf -delete
# hasher might have carried host /etc/hosts over, need to overwrite # hasher might have carried host /etc/hosts over, need to overwrite
echo "127.0.0.1 localhost.localdomain localhost" > /etc/hosts echo "127.0.0.1 localhost.localdomain localhost" > /etc/hosts
sed -ri "/^(search|nameserver)/d" /etc/resolv.conf
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment