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

vm-net: feature retired

Browse Source 
This one was replaced by the net feature completely
and has been declared obsolete since 1.1.1 (a month ago).

A few remaining users trivially adjusted.
This commit is contained in:
Michael Shigorin 2013-08-06 22:41:49 +04:00
parent de94641c41
commit 43e76bd650
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf.d/test.mk
View File

@ -72,9 +72,8 @@ endif # IMAGE_CLASS: ve
ifeq (vm,$(IMAGE_CLASS))
vm/net-static: vm/bare use/vm-net/static use/net-ssh
@$(call set,VM_NET_IPV4ADDR,10.0.2.16/24)
@$(call set,VM_NET_IPV4GW,10.0.2.2)
vm/net-static: vm/bare use/net-eth use/net-ssh
@$(call add,NET_ETH,eth0:static:10.0.2.16/24:10.0.2.2)
endif # IMAGE_CLASS: vm

2
conf.d/vm.mk
View File

@ -4,7 +4,7 @@ ifeq (vm,$(IMAGE_CLASS))
vm/bare: vm/.bare
@$(call add,BASE_PACKAGES,apt)
vm/net: vm/bare use/vm-net/dhcp use/net-ssh
vm/net: vm/bare use/net-eth/dhcp use/net-ssh
@$(call add,BASE_PACKAGES,su)
# NB: use/x11 employs some installer-feature packages

1
features.in/vm-net/README
View File

@ -1 +0,0 @@
Эта фича устарела, более общая называется net-eth.

8
features.in/vm-net/config.mk
View File

@ -1,8 +0,0 @@
use/vm-net:
@$(warning obsolete feature, please upgrade to use/net-eth)
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 use/net-eth
@$(call add,NET_ETH,eth0:static:$(VM_NET_IPV4ADDR):$(VM_NET_IPV4GW))