server: generalize server-ovz configuration bits

OpenVZ related part is now a reusable use/server/ovz target, and service related groups which have been largely taken from rider@'s server-light project are now use/server/groups/base.

server: generalize server-ovz configuration bits
0da7ae54 · Michael Shigorin · 31084651 · 0da7ae54 · 0da7ae54
Commit 0da7ae54 authored Feb 26, 2014 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 11 deletions

server.mk conf.d/server.mk +4 -11

config.mk features.in/server/config.mk +13 -0

No files found.
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -11,18 +11,11 @@ distro/server-nano: distro/.server-base use/bootloader/lilo +power

 distro/server-mini: distro/.server-base use/server/mini use/kernel/net \
 	use/efi use/stage2/net-eth
+	@$(call set,INSTALLER,altlinux-server)
 	@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)

-distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
-	use/firmware/server use/firmware/cpu use/power/acpi/button +wireless
-	@$(call set,STAGE1_KFLAVOUR,std-def)
-	@$(call set,KFLAVOURS,std-def ovz-el)
-	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring)
-	@$(call add,MAIN_KMODULES,xtables-addons)	# t6/branch
-	@$(call add,MAIN_KMODULES,drbd83 kvm)
-	@$(call add,BASE_LISTS,ovz-server)
-	@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
-	@$(call add,MAIN_GROUPS,ipmi mysql-server dhcp-server mail-server)
-	@$(call add,MAIN_GROUPS,monitoring diag-tools)
+distro/server-ovz: distro/server-mini use/server/ovz use/server/groups/base \
+	use/install2/net use/hdt use/rescue use/power/acpi/button \
+	use/firmware/server use/firmware/cpu +wireless; @:

 endif
--- a/features.in/server/config.mk
+++ b/features.in/server/config.mk
@@ -9,3 +9,16 @@ use/server/mini: use/server use/net-ssh
 	@$(call add,THE_LISTS,$(call tags,extra && (server || network)))
 	@$(call add,MAIN_LISTS,osec)
 	@$(call add,DEFAULT_SERVICES_DISABLE,messagebus lvm2-lvmetad)
+
+use/server/ovz: use/server
+	@$(call set,STAGE1_KFLAVOUR,std-def)
+	@$(call set,KFLAVOURS,std-def ovz-el)
+	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring)
+	@$(call add,MAIN_KMODULES,xtables-addons)	# t6/branch
+	@$(call add,MAIN_KMODULES,drbd83 kvm)
+	@$(call add,BASE_LISTS,ovz-server)
+
+use/server/groups/base: use/server
+	@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
+	@$(call add,MAIN_GROUPS,ipmi mysql-server dhcp-server mail-server)
+	@$(call add,MAIN_GROUPS,monitoring diag-tools)