obsoleted vm-net feature

Hooray, this one is almost retired by now!
This commit is contained in:
Michael Shigorin 2013-06-25 20:09:05 +04:00
parent fb419a9f7d
commit 91f0c4217c
3 changed files with 5 additions and 36 deletions

View File

@ -1,3 +1 @@
Эта фича добавляет базовую поддержку сети в создаваемый образ
виртуальной машины. Принимаются предложения по усовершенствованию
статической конфигурации.
Эта фича устарела, более общая называется net-eth.

View File

@ -1,11 +1,8 @@
use/vm-net:
@$(call add_feature)
@$(call add,THE_PACKAGES,etcnet)
@$(warning obsolete feature, please upgrade to use/net-eth)
use/vm-net/dhcp: use/vm-net
@$(call add,THE_PACKAGES,dhcpcd)
@$(call set,VM_NET,dhcp)
use/vm-net/dhcp: use/vm-net use/net-eth/dhcp
# need to further add VM_NET_IPV4ADDR and VM_NET_IPV4GW
use/vm-net/static: use/vm-net
@$(call set,VM_NET,static)
use/vm-net/static: use/vm-net use/net-eth
@$(call add,NET_ETH,eth0:static:$(VM_NET_IPV4ADDR):$(VM_NET_IPV4GW))

View File

@ -1,26 +0,0 @@
ifdef BUILDDIR
include $(BUILDDIR)/distcfg.mk
all: dir = $(BUILDDIR)/files/etc/net/ifaces/eth0
all:
@write_static() { \
echo "$(VM_NET_IPV4ADDR)" > "$(dir)/ipv4address"; \
echo "default via $(VM_NET_IPV4GW)" > "$(dir)/ipv4route"; \
}; \
if [ -n "$(VM_NET)" ] && mkdir -p "$(dir)"; then \
case "$(VM_NET)" in \
dhcp) ;; \
static) write_static;; \
*) \
echo "** error: unknown value of $(VM_NET)" >&2; \
exit 1;; \
esac; \
{ \
echo "TYPE=eth"; \
echo "DISABLED=no"; \
echo "BOOTPROTO=$(VM_NET)"; \
} > "$(dir)/options"; \
fi
endif