vm feature renamed to vmguest

The "vm" name became a bit confusing with the introduction of build-vm feature; let's call this one "vmguest" until we do hierarchical (sub)features.

vm feature renamed to vmguest
11d4f406 · Michael Shigorin · e355bd7c · 11d4f406 · e355bd7c · 11d4f406
Commit 11d4f406 authored Jun 21, 2012 by Michael Shigorin
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

config.mk features.in/install2/config.mk +1 -1

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

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

config.mk features.in/vmguest/config.mk +3 -3

No files found.
--- a/features.in/install2/config.mk
+++ b/features.in/install2/config.mk
@@ -13,6 +13,6 @@ use/install2/net: use/install2
 use/install2/kms: use/stage2/kms
 	@$(call add,BASE_KMODULES_REGEXP,drm.*)

-# see also use/vm/kvm/guest; qxl included in xorg pkglist
+# see also use/vmguest/kvm; qxl included in xorg pkglist
 use/install2/kvm:
 	@$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl)
--- a/features.in/vm/README
+++ b/features.in/vm/README
-Эта фича предназначена для конфигурирования поддержки
-виртуальных машин; в данный момент со стороны гостевой ОС.
--- a/features.in/vmguest/README
+++ b/features.in/vmguest/README
+Эта фича предназначена для конфигурирования поддержки выполнения
+дистрибутивов в качестве гостей в среде виртуальных машин.
--- a/features.in/vm/config.mk
+++ b/features.in/vm/config.mk
-+vmguest: use/vm/virtualbox/guest use/vm/kvm/guest; @:
+vmguest: use/vmguest/virtualbox use/vmguest/kvm; @:

-use/vm/virtualbox/guest:
+use/vmguest/virtualbox:
 	@$(call add_feature)
 	@$(call add,THE_KMODULES,virtualbox-addition drm)
 	@$(call add,THE_PACKAGES,virtualbox-guest-additions)

 # NB: only reasonable for X11-bearing images
-use/vm/kvm/guest:
+use/vmguest/kvm:
 	@$(call add_feature)
 	@$(call add,THE_PACKAGES,spice-vdagent)