vm-net: feature retired

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.

vm-net: feature retired
43e76bd6 · Michael Shigorin · de94641c · 43e76bd6 · 43e76bd6 · de94641c
Commit 43e76bd6 authored Aug 06, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 13 deletions

test.mk conf.d/test.mk +2 -3

vm.mk conf.d/vm.mk +1 -1

README features.in/vm-net/README +0 -1

config.mk features.in/vm-net/config.mk +0 -8

No files found.
--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -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


--- a/conf.d/vm.mk
+++ b/conf.d/vm.mk
@@ -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

--- a/features.in/vm-net/README
+++ b/features.in/vm-net/README
-Эта фича устарела, более общая называется net-eth.
--- a/features.in/vm-net/config.mk
+++ b/features.in/vm-net/config.mk
-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))