From c54b335fcc6dd15c54d28d556fc124007f0a3566 Mon Sep 17 00:00:00 2001
From: Yolanda Robla <yolanda.robla-mota@hp.com>
Date: Tue, 15 Dec 2015 20:47:19 +0100
Subject: [PATCH] Split vm and bootloader elements

In order to add more flexibility to the vm and bootloader
elements, split the functionality in two different ones, and
make vm depend on bootloader element.
This will allow to construct more elements that depend on
bootloader, and develop both elements independently.

Change-Id: Iad2503b7b8fe53b768a3bc79e4cb839700fbd747
---
 elements/bootloader/README.rst                             | 7 +++++++
 elements/{vm => bootloader}/cleanup.d/51-bootloader        | 0
 .../51-bootloader => bootloader/finalise.d/50-bootloader}  | 0
 elements/vm/README.rst                                     | 5 -----
 elements/vm/element-deps                                   | 1 +
 5 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 elements/bootloader/README.rst
 rename elements/{vm => bootloader}/cleanup.d/51-bootloader (100%)
 rename elements/{vm/finalise.d/51-bootloader => bootloader/finalise.d/50-bootloader} (100%)
 create mode 100644 elements/vm/element-deps

diff --git a/elements/bootloader/README.rst b/elements/bootloader/README.rst
new file mode 100644
index 000000000..ecfefc428
--- /dev/null
+++ b/elements/bootloader/README.rst
@@ -0,0 +1,7 @@
+==========
+bootloader
+==========
+Installs grub[2] on boot partition on the system. In case GRUB2
+is not available in the system, a fallback to Extlinux will happen. It's
+also possible to enforce the use of Extlinux by exporting a DIB_EXTLINUX
+variable to the environment.
diff --git a/elements/vm/cleanup.d/51-bootloader b/elements/bootloader/cleanup.d/51-bootloader
similarity index 100%
rename from elements/vm/cleanup.d/51-bootloader
rename to elements/bootloader/cleanup.d/51-bootloader
diff --git a/elements/vm/finalise.d/51-bootloader b/elements/bootloader/finalise.d/50-bootloader
similarity index 100%
rename from elements/vm/finalise.d/51-bootloader
rename to elements/bootloader/finalise.d/50-bootloader
diff --git a/elements/vm/README.rst b/elements/vm/README.rst
index 678982e43..4dbf6e365 100644
--- a/elements/vm/README.rst
+++ b/elements/vm/README.rst
@@ -3,8 +3,3 @@ vm
 ==
 Sets up a partitioned disk (rather than building just one filesystem with no
 partition table).
-
-By default the disk will have grub[2]-install run on it. In case GRUB2
-is not available in the system, a fallback to Extlinux will happen. It's
-also possible to enforce the use of Extlinux by exporting a DIB_EXTLINUX
-variable to the environment.
diff --git a/elements/vm/element-deps b/elements/vm/element-deps
new file mode 100644
index 000000000..54960172d
--- /dev/null
+++ b/elements/vm/element-deps
@@ -0,0 +1 @@
+bootloader