server-ovz: rebase onto server-mini

The culprit was missing dhcpcd, although the rest of niceties already in server-mini were welcome to server-ovz either.

server-ovz: rebase onto server-mini
781c98bb · Michael Shigorin · c4a5515b · 781c98bb
Commit 781c98bb authored Nov 16, 2011 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

server.mk conf.d/server.mk +3 -5

No files found.
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -14,16 +14,14 @@ distro/server-mini: distro/server-base use/cleanup/x11-alterator
 distro/server-systemd: distro/server-mini use/systemd
-distro/server-ovz: distro/server-base \
+distro/server-ovz: distro/server-mini \
-	use/hdt use/rescue use/firmware/server use/power/acpi/button \
+	use/hdt use/rescue use/firmware/server use/power/acpi/button
-	use/cleanup/x11-alterator
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(call set,KFLAVOURS,std-def ovz-el)
-	@$(call add,KMODULES,bcmwl e1000e igb ndiswrapper rtl8168 rtl8192)
+	@$(call add,KMODULES,bcmwl ndiswrapper rtl8168 rtl8192)
 	@$(call add,KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons)
 	@$(call add,KMODULES,drbd83 kvm)
 	@$(call add,BASE_LISTS,ovz-server)
-	@$(call add,BASE_LISTS,$(call tags,base server))
 	@$(call add,MAIN_LISTS,kernel-wifi)
 	@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
 	@$(call add,MAIN_GROUPS,ipmi mysql-server dhcp-server mail-server)