initial live-testserver.iso

Also pulled the pkglist/kmodule part out of distro/server-mini's recipe and started off a standalone feature based on it. NB: el-smp kernel now contains aufs as a module but propagator doesn't try to modprobe it.

initial live-testserver.iso
57747b22 · Michael Shigorin · 7eaa8685 · 57747b22 · 57747b22 · 57747b22
Commit 57747b22 authored Jul 28, 2012 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 6 deletions

live.mk conf.d/live.mk +3 -0

server.mk conf.d/server.mk +1 -6

README features.in/server/README +2 -0

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

No files found.
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -76,4 +76,7 @@ distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
 	@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync)
 	@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)

+distro/live-testserver: distro/live-install use/server/mini
+	@$(call set,KFLAVOURS,std-def el-smp)
+
 endif
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -9,13 +9,8 @@ distro/server-nano: distro/.server-base \
 	@$(call add,BASE_LISTS,$(call tags,server network))
 	@$(call add,BASE_PACKAGES,dhcpcd cpio)

-distro/server-mini: distro/.server-base use/cleanup/x11-alterator
+distro/server-mini: distro/.server-base use/server/mini use/cleanup/x11-alterator
 	@$(call set,KFLAVOURS,el-smp)
-	@$(call add,THE_KMODULES,e1000e igb)
-	@$(call add,STAGE1_KMODULES,e1000e igb)
-	@$(call add,BASE_LISTS,\
-		$(call tags,base && (server || network || security || pkg)))
-	@$(call add,BASE_LISTS,$(call tags,extra (server || network)))

 distro/server-systemd: distro/server-mini use/systemd
 	@$(call set,KFLAVOURS,std-def)

--- a/features.in/server/README
+++ b/features.in/server/README
+Эта фича предоставляет типичные для серверных образов
+наборы списков пакетов и модулей ядра.
--- a/features.in/server/config.mk
+++ b/features.in/server/config.mk
+use/server:
+	@$(call add_feature)
+
+use/server/mini: use/server
+	@$(call add,THE_KMODULES,e1000e igb)
+	@$(call add,STAGE1_KMODULES,e1000e igb)
+	@$(call add,THE_LISTS,\
+		$(call tags,base && (server || network || security || pkg)))
+	@$(call add,THE_LISTS,$(call tags,extra (server || network)))