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.
This commit is contained in:
Michael Shigorin 2016-01-29 15:35:17 +03:00
parent e208d97f5a
commit b1005e5146
3 changed files with 10 additions and 7 deletions

View File

@ -12,15 +12,18 @@ use/server/mini: use/server use/firmware/server \
@$(call add,INSTALL2_PACKAGES,installer-feature-server-raid-fixup-stage2) @$(call add,INSTALL2_PACKAGES,installer-feature-server-raid-fixup-stage2)
@$(call add,DEFAULT_SERVICES_DISABLE,messagebus lvm2-lvmetad) @$(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,STAGE1_KFLAVOUR,std-def)
@$(call set,KFLAVOURS,std-def ovz-el) @$(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,ipset ipt-netflow opendpi pf_ring)
@$(call add,MAIN_KMODULES,xtables-addons) # t6/branch @$(call add,MAIN_KMODULES,xtables-addons) # t6/branch
@$(call add,MAIN_KMODULES,drbd83 kvm) @$(call add,MAIN_KMODULES,drbd83 kvm)
@$(call add,MAIN_KMODULES,staging) @$(call add,MAIN_KMODULES,staging)
@$(call add,BASE_PACKAGES,lftp wget) @$(call add,BASE_LISTS,$(call tags,server openvz))
@$(call add,BASE_LISTS,ovz-server)
# NB: examine zabbix-preinstall package, initialization is NOT automatic! # NB: examine zabbix-preinstall package, initialization is NOT automatic!
use/server/zabbix: use/server use/services use/control use/server/zabbix: use/server use/services use/control

View File

@ -0,0 +1,4 @@
vzctl
vzdump
vzquota
htop

View File

@ -1,9 +1,5 @@
vzctl
vzdump
#vzautolimit #vzautolimit
#vzfree #vzfree
vzquota
#vzvalidate #vzvalidate
htop
openvz-etersoft openvz-etersoft
yabeda yabeda