Skip to content

M
mkimage-profiles
Commit defda09a authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

regular.mk: reworked regular-server a bit

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.
parent e2bcc33a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
conf.d/regular.mk
View file @ defda09a
...@@ -242,9 +242,12 @@ distro/.regular-server: distro/.regular-install \ ...@@ -242,9 +242,12 @@ distro/.regular-server: distro/.regular-install \
distro/.regular-server-managed: distro/.regular-server distro/.regular-server-managed: distro/.regular-server
@$(call add,THE_PACKAGES,alterator-fbi) @$(call add,THE_PACKAGES,alterator-fbi)
@$(call add,THE_LISTS,$(call tags,server alterator)) @$(call add,THE_LISTS,$(call tags,server alterator))
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord) @$(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 \ distro/regular-server-ovz: distro/.regular-server \
use/server/ovz use/server/groups/tools use/cleanup/x11-alterator use/server/ovz use/server/groups/tools use/cleanup/x11-alterator
...@@ -252,7 +255,6 @@ distro/regular-server-ovz: distro/.regular-server \ ...@@ -252,7 +255,6 @@ distro/regular-server-ovz: distro/.regular-server \
distro/regular-server-hyperv: distro/.regular-server-managed distro/regular-server-hyperv: distro/.regular-server-managed
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,THE_PACKAGES,hyperv-daemons) @$(call add,THE_PACKAGES,hyperv-daemons)
@$(call add,DEFAULT_SERVICES_DISABLE,bridge smartd) @$(call add,DEFAULT_SERVICES_DISABLE,bridge smartd)
@$(call add,DEFAULT_SERVICES_DISABLE,cpufreq-simple powertop) @$(call add,DEFAULT_SERVICES_DISABLE,cpufreq-simple powertop)
......
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