regular.mk: rework server images a bit
This refactoring is aimed at both providing reasonable alterator package set in server-ovz (and server-hyperv) while purging the install-time modules from plain server as these were useless without a frontend package like the web-based alterator-fbi.
This commit is contained in:
parent
719e1d7d0c
commit
b4d704f2c1
@ -192,7 +192,7 @@ distro/regular-sysv-tde: distro/.regular-install-x11 \
|
||||
@$(call add,THE_LISTS,$(call tags,regular tde))
|
||||
@$(call add,MAIN_PACKAGES,man-whatis usb-modeswitch)
|
||||
|
||||
distro/regular-server: distro/.regular-install \
|
||||
distro/.regular-server: distro/.regular-install \
|
||||
use/server/mini use/rescue/base use/cleanup/x11
|
||||
@$(call add,THE_LISTS,$(call tags,regular server))
|
||||
@$(call add,MAIN_PACKAGES,aptitude)
|
||||
@ -200,16 +200,20 @@ distro/regular-server: distro/.regular-install \
|
||||
@$(call add,CLEANUP_PACKAGES,qt4-common)
|
||||
@$(call add,DEFAULT_SERVICES_DISABLE,bridge)
|
||||
|
||||
distro/regular-server-ovz: distro/regular-server \
|
||||
use/server/ovz use/server/groups/base; @:
|
||||
distro/regular-server: distro/.regular-server use/cleanup/x11-alterator; @:
|
||||
|
||||
distro/regular-server-hyperv: distro/regular-server
|
||||
@$(call set,KFLAVOURS,un-def)
|
||||
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
|
||||
@$(call add,THE_PACKAGES,hyperv-daemons)
|
||||
distro/.regular-server-managed: distro/.regular-server
|
||||
@$(call add,THE_PACKAGES,alterator-fbi)
|
||||
@$(call add,THE_LISTS,$(call tags,server alterator))
|
||||
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
|
||||
|
||||
distro/regular-server-ovz: distro/.regular-server-managed \
|
||||
use/server/ovz use/server/groups/base
|
||||
|
||||
distro/regular-server-hyperv: distro/.regular-server-managed
|
||||
@$(call set,KFLAVOURS,un-def)
|
||||
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
|
||||
@$(call add,THE_PACKAGES,hyperv-daemons)
|
||||
@$(call add,DEFAULT_SERVICES_DISABLE,bridge cpufreq-simple)
|
||||
|
||||
distro/regular-builder: distro/.regular-bare \
|
||||
|
Loading…
Reference in New Issue
Block a user