minicd.iso -> server-mini.iso (and more tags)

minicd target was a hasty hack indeed, let's put it in line; an attempt at practical use discovered the lack of important packages like dhcpcd, these were added on per package basis and quickly remade to use tags -- which seem to fit better.

minicd.iso -> server-mini.iso (and more tags)
4dfd6898 · Michael Shigorin · cf81cc67 · 4dfd6898 · 4dfd6898 · 4dfd6898
Commit 4dfd6898 authored Aug 31, 2011 by Michael Shigorin
6 changed files
--- a/distro.mk
+++ b/distro.mk
@@ -49,23 +49,26 @@ distro/server-base: distro/installer sub/main \
 	use/syslinux/ui-menu use/memtest use/bootloader/grub
 	@$(call add,BASE_LISTS,server-base)

+distro/server-mini: distro/server-base
+	@$(call set,KFLAVOURS,el-smp)
+	@$(call add,KMODULES,e1000e igb)
+	@$(call add,BASE_LISTS,\
+		$(call tags,base && (server || network || security || pkg)))
+	@$(call add,BASE_LISTS,$(call tags,extra network))
+
 distro/server-ovz: distro/server-base use/hdt use/rescue use/firmware/server
 	@$(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,ipset ipt-netflow opendpi pf_ring xtables-addons)
 	@$(call add,KMODULES,drbd83 kvm)
-	@$(call add,MAIN_LISTS,kernel-wifi)
 	@$(call add,BASE_LISTS,ovz-server)
 	@$(call add,BASE_LISTS,$(call tags,base server))
+	@$(call add,MAIN_LISTS,kernel-wifi)
 	@$(call add,GROUPS,dns-server http-server ftp-server kvm-server)
 	@$(call add,GROUPS,ipmi mysql-server dhcp-server mail-server)
 	@$(call add,GROUPS,monitoring diag-tools)

-distro/minicd: distro/server-base
-	@$(call set,KFLAVOURS,pure-emerald)	# usually recent drivers
-	@$(call add,MAIN_PACKAGES,etcnet-full)
-
 # desktop distributions

 distro/desktop-base: distro/installer sub/main \

--- a/pkg.in/lists/tagged/base+network
+++ b/pkg.in/lists/tagged/base+network
+etcnet
+dhcpcd
--- a/pkg.in/lists/tagged/base+pkg
+++ b/pkg.in/lists/tagged/base+pkg
+apt
--- a/pkg.in/lists/tagged/base+security
+++ b/pkg.in/lists/tagged/base+security
+sudo
+su
+passwd
--- a/pkg.in/lists/tagged/extra+network
+++ b/pkg.in/lists/tagged/extra+network
+etcnet-full
+net-tools
--- a/pkg.in/lists/tagged/base+server+net
+++ b/pkg.in/lists/tagged/base+server+net
 # network tools
 curl
 elinks
-etcnet
 hostinfo
 iptables
 iputils