From b1005e51461835cbd886c125c7cb072225a192ac Mon Sep 17 00:00:00 2001
From: Michael Shigorin <mike@altlinux.org>
Date: Fri, 29 Jan 2016 15:35:17 +0300
Subject: [PATCH] ovz-server: split into tagged/{base,server}+openvz

Those packages which are *required* should be available
for standalone use; and those which are optional should go
into extras.

Adjust server feature accordingly.
---
 features.in/server/config.mk                      | 9 ++++++---
 pkg.in/lists/tagged/base+openvz                   | 4 ++++
 pkg.in/lists/{ovz-server => tagged/server+openvz} | 4 ----
 3 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 pkg.in/lists/tagged/base+openvz
 rename pkg.in/lists/{ovz-server => tagged/server+openvz} (68%)

diff --git a/features.in/server/config.mk b/features.in/server/config.mk
index bf6a5520..dade8d1d 100644
--- a/features.in/server/config.mk
+++ b/features.in/server/config.mk
@@ -12,15 +12,18 @@ use/server/mini: use/server use/firmware/server \
 	@$(call add,INSTALL2_PACKAGES,installer-feature-server-raid-fixup-stage2)
 	@$(call add,DEFAULT_SERVICES_DISABLE,messagebus lvm2-lvmetad)
 
-use/server/ovz: use/server
+use/server/ovz-base: use/server
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(call set,KFLAVOURS,std-def ovz-el)
+	@$(call add,BASE_PACKAGES,lftp wget)
+	@$(call add,BASE_LISTS,$(call tags,base openvz))
+
+use/server/ovz: use/server/ovz-base
 	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring)
 	@$(call add,MAIN_KMODULES,xtables-addons)	# t6/branch
 	@$(call add,MAIN_KMODULES,drbd83 kvm)
 	@$(call add,MAIN_KMODULES,staging)
-	@$(call add,BASE_PACKAGES,lftp wget)
-	@$(call add,BASE_LISTS,ovz-server)
+	@$(call add,BASE_LISTS,$(call tags,server openvz))
 
 # NB: examine zabbix-preinstall package, initialization is NOT automatic!
 use/server/zabbix: use/server use/services use/control
diff --git a/pkg.in/lists/tagged/base+openvz b/pkg.in/lists/tagged/base+openvz
new file mode 100644
index 00000000..aabffd80
--- /dev/null
+++ b/pkg.in/lists/tagged/base+openvz
@@ -0,0 +1,4 @@
+vzctl
+vzdump
+vzquota
+htop
diff --git a/pkg.in/lists/ovz-server b/pkg.in/lists/tagged/server+openvz
similarity index 68%
rename from pkg.in/lists/ovz-server
rename to pkg.in/lists/tagged/server+openvz
index 2b4168eb..e9a96d92 100644
--- a/pkg.in/lists/ovz-server
+++ b/pkg.in/lists/tagged/server+openvz
@@ -1,9 +1,5 @@
-vzctl
-vzdump
 #vzautolimit
 #vzfree
-vzquota
 #vzvalidate
-htop
 openvz-etersoft
 yabeda