armh, build-ve, ve.mk: reworked accordingly
Drop duplicated code pulled into armh feature in haste and another half-copy that made it into build-ve feature; make ve.mk more explicit about what it actually does regarding default nameservers (and switch it to level3 while at that, just for diversity they preach).
This commit is contained in:
parent
7459a74abc
commit
013fd43294
@ -4,7 +4,7 @@ ifeq (ve,$(IMAGE_CLASS))
|
||||
ve/bare: ve/.base +sysvinit; @:
|
||||
|
||||
# /dev/pty and friends start here
|
||||
ve/base: ve/bare
|
||||
ve/base: ve/bare use/net-dns/level3
|
||||
@$(call add,BASE_PACKAGES,interactivesystem)
|
||||
|
||||
# a particular package list
|
||||
|
@ -1,2 +1,2 @@
|
||||
use/armh: use/control/sudo-su
|
||||
use/armh: use/control/sudo-su use/net/dns/google
|
||||
@$(call add_feature)
|
||||
|
@ -1,40 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# DESCRIPTION
|
||||
#
|
||||
# Setup network settings
|
||||
# 1. Truncate /etc/resolv.conf
|
||||
# 2. Init /etc/hosts with "127.0.0.1 localhost"
|
||||
# 3. Set hostname, domainname
|
||||
# 4. Set defaults for NetworkManager.
|
||||
|
||||
|
||||
# REQUIRES
|
||||
#
|
||||
# Nothing
|
||||
|
||||
|
||||
# INFO
|
||||
# At startup time hostname may be changed by live-hostname package.
|
||||
|
||||
. shell-config
|
||||
|
||||
NAME="init3-network"
|
||||
|
||||
verbose()
|
||||
{
|
||||
if [ -n "$GLOBAL_VERBOSE" ]; then
|
||||
echo "HOOK: $NAME: $@"
|
||||
fi
|
||||
}
|
||||
|
||||
verbose "has started"
|
||||
|
||||
DOMAINNAME="localdomain"
|
||||
HOSTNAME="localhost.localdomain"
|
||||
|
||||
verbose "Init /etc/hosts with 127.0.0.1 localhost"
|
||||
echo "127.0.0.1 localhost localhost.localdomain" > /etc/hosts
|
||||
|
||||
verbose "Truncate /etc/resolv.conf"
|
||||
echo nameserver 8.8.8.8 >/etc/resolv.conf
|
@ -1,9 +0,0 @@
|
||||
#!/bin/sh
|
||||
# by default hasher copy resolv.conf and /etc/hosts from host system
|
||||
# we need to change it to useful defaults
|
||||
|
||||
echo 'nameserver 8.8.8.8' > /etc/resolv.conf
|
||||
echo 'nameserver 8.8.4.4' > /etc/resolv.conf
|
||||
#echo 'nameserver 2001:4860:4860::8888' > /etc/resolv.conf
|
||||
#echo 'nameserver 2001:4860:4860::8844' > /etc/resolv.conf
|
||||
echo '127.0.0.1 localhost.localdomain localhost' > /etc/hosts
|
Loading…
Reference in New Issue
Block a user