From 43e76bd650b97e9719ba0307e48cba9dd202f32c Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 6 Aug 2013 22:41:49 +0400 Subject: [PATCH] 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. --- conf.d/test.mk | 5 ++--- conf.d/vm.mk | 2 +- features.in/vm-net/README | 1 - features.in/vm-net/config.mk | 8 -------- 4 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 features.in/vm-net/README delete mode 100644 features.in/vm-net/config.mk diff --git a/conf.d/test.mk b/conf.d/test.mk index d3926c64..7be9c82d 100644 --- 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 diff --git a/conf.d/vm.mk b/conf.d/vm.mk index 0f40ff42..96930eee 100644 --- 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 diff --git a/features.in/vm-net/README b/features.in/vm-net/README deleted file mode 100644 index 43038902..00000000 --- a/features.in/vm-net/README +++ /dev/null @@ -1 +0,0 @@ -Эта фича устарела, более общая называется net-eth. diff --git a/features.in/vm-net/config.mk b/features.in/vm-net/config.mk deleted file mode 100644 index 3d3d8d7c..00000000 --- a/features.in/vm-net/config.mk +++ /dev/null @@ -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))