From 11d4f4062e8e70de34b2004d03cd39159cdac802 Mon Sep 17 00:00:00 2001
From: Michael Shigorin <mike@altlinux.org>
Date: Thu, 21 Jun 2012 13:23:38 +0300
Subject: [PATCH] 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.
---
 features.in/install2/config.mk        | 2 +-
 features.in/vm/README                 | 2 --
 features.in/vmguest/README            | 2 ++
 features.in/{vm => vmguest}/config.mk | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 features.in/vm/README
 create mode 100644 features.in/vmguest/README
 rename features.in/{vm => vmguest}/config.mk (73%)

diff --git a/features.in/install2/config.mk b/features.in/install2/config.mk
index 793421e0..33fc243a 100644
--- 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)
diff --git a/features.in/vm/README b/features.in/vm/README
deleted file mode 100644
index 7e48b317..00000000
--- a/features.in/vm/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Эта фича предназначена для конфигурирования поддержки
-виртуальных машин; в данный момент со стороны гостевой ОС.
diff --git a/features.in/vmguest/README b/features.in/vmguest/README
new file mode 100644
index 00000000..1ac753f8
--- /dev/null
+++ b/features.in/vmguest/README
@@ -0,0 +1,2 @@
+Эта фича предназначена для конфигурирования поддержки выполнения
+дистрибутивов в качестве гостей в среде виртуальных машин.
diff --git a/features.in/vm/config.mk b/features.in/vmguest/config.mk
similarity index 73%
rename from features.in/vm/config.mk
rename to features.in/vmguest/config.mk
index 639dfc09..e679c8ec 100644
--- a/features.in/vm/config.mk
+++ b/features.in/vmguest/config.mk
@@ -1,12 +1,12 @@
-+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)