Commit 8acd1a12 authored by Alexey Shabalin's avatar Alexey Shabalin Committed by Anton Midyukov

server, server-v.mk: Added use/server/virt and migrate server-v to use it

parent 78d0fdf4
...@@ -59,7 +59,7 @@ distro/.server-v-base: distro/.installer use/syslinux/ui/menu use/memtest ...@@ -59,7 +59,7 @@ distro/.server-v-base: distro/.installer use/syslinux/ui/menu use/memtest
distro/server-v: distro/.server-v-base +installer \ distro/server-v: distro/.server-v-base +installer \
use/kernel/server use/init/systemd/multiuser \ use/kernel/server use/init/systemd/multiuser \
use/services use/ntp/chrony \ use/services use/ntp/chrony \
use/server/base use/firmware use/firmware/cpu \ use/server/virt use/firmware use/firmware/cpu \
use/l10n/default/ru_RU use/install2/vnc \ use/l10n/default/ru_RU use/install2/vnc \
use/isohybrid \ use/isohybrid \
use/install2/xfs use/install2/fat \ use/install2/xfs use/install2/fat \
...@@ -89,7 +89,6 @@ distro/server-v: distro/.server-v-base +installer \ ...@@ -89,7 +89,6 @@ distro/server-v: distro/.server-v-base +installer \
@$(call add,THE_LISTS,$(call tags,server alterator)) @$(call add,THE_LISTS,$(call tags,server alterator))
@$(call add,COMMON_PACKAGES,vim-console) @$(call add,COMMON_PACKAGES,vim-console)
@$(call add,SYSTEM_PACKAGES,mdadm-tool lvm2 multipath-tools vdo) @$(call add,SYSTEM_PACKAGES,mdadm-tool lvm2 multipath-tools vdo)
@$(call add,BASE_KMODULES,ipset kvm xtables-addons kvdo)
@$(call add,BASE_LISTS,virt/base.pkgs) @$(call add,BASE_LISTS,virt/base.pkgs)
@$(call add,MAIN_GROUPS,server-v/110-basic server-v/kvm) @$(call add,MAIN_GROUPS,server-v/110-basic server-v/kvm)
ifeq (,$(filter-out x86_64,$(ARCH))) ifeq (,$(filter-out x86_64,$(ARCH)))
......
...@@ -29,6 +29,12 @@ use/server/ovz: use/server/ovz-base ...@@ -29,6 +29,12 @@ use/server/ovz: use/server/ovz-base
@$(call add,MAIN_KMODULES,staging) @$(call add,MAIN_KMODULES,staging)
@$(call add,BASE_LISTS,$(call tags,server openvz)) @$(call add,BASE_LISTS,$(call tags,server openvz))
use/server/virt: use/server use/kernel
@$(call add,BASE_PACKAGES,openssh)
@$(call set,STAGE1_KFLAVOUR,std-def)
@$(call set,KFLAVOURS,std-def)
@$(call add,THE_KMODULES,kvm)
# 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
@$(call add,THE_LISTS,$(call tags,server zabbix)) @$(call add,THE_LISTS,$(call tags,server zabbix))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment