shaba/mkimage-profiles
1
0
Fork 0
forked from altcloud/mkimage-profiles
Code Issues 1 Pull Requests Releases Wiki Activity

regular.mk: reworked regular-server a bit

Browse Source 
This starts a sort of "server merger" by consuming
both samba4 and hyperv subflavours into checkboxes.

Rationale is pretty clear: environment -- including
hypervisors -- is just an install/run-time variable,
and the set of initial services is another one;
no need to maintain a distinct image for each value
when we've done enough of that to know we can merge.
This commit is contained in:
Michael Shigorin 2016-04-27 14:30:31 +03:00
parent e2bcc33a53
commit defda09a2d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf.d/regular.mk
View File

@ -242,9 +242,12 @@ distro/.regular-server: distro/.regular-install \
distro/.regular-server-managed: distro/.regular-server
@$(call add,THE_PACKAGES,alterator-fbi)
@$(call add,THE_LISTS,$(call tags,server alterator))
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
distro/regular-server: distro/.regular-server-managed use/server/groups/base; @:
distro/regular-server: distro/.regular-server-managed use/server/groups/base
@$(call add,MAIN_GROUPS,sambaDC-server)
@$(call add,MAIN_GROUPS,hyperv-tools)
distro/regular-server-ovz: distro/.regular-server \
use/server/ovz use/server/groups/tools use/cleanup/x11-alterator
@ -252,7 +255,6 @@ distro/regular-server-ovz: distro/.regular-server \
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 smartd)
@$(call add,DEFAULT_SERVICES_DISABLE,cpufreq-simple powertop)