From 85b5ef0c8db403279cc70db73ab26d33954d5e57 Mon Sep 17 00:00:00 2001
From: Lucas Alvares Gomes <lucasagomes@gmail.com>
Date: Mon, 20 May 2013 11:59:21 +0100
Subject: [PATCH] Move the ensure_nbd function call.

Move the ensure_nbd function call from the disk-image-create to the
disk-image-get-kernel. The image creation process does not use qemu-nbd
anymore.

Change-Id: I8ff2ad54f322a9e33d52408fa4e253a7b45900c7
---
 bin/disk-image-create     | 3 ---
 bin/disk-image-get-kernel | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/disk-image-create b/bin/disk-image-create
index 1dae5c23..091b39cb 100755
--- a/bin/disk-image-create
+++ b/bin/disk-image-create
@@ -92,9 +92,6 @@ IMAGE_ELEMENT=$($SCRIPT_HOME/element-info --expand-dependencies $IMAGE_ELEMENT)
 echo "Building elements: $IMAGE_ELEMENT"
 echo "If prompted for sudo, install sudoers.d/img-build-sudoers into /etc/sudoers.d and restart the build."
 
-# TODO: make into an element.
-ensure_nbd
-
 mk_build_dir
 create_base
 run_d extra-data
diff --git a/bin/disk-image-get-kernel b/bin/disk-image-get-kernel
index 6affc12d..4e7e8447 100755
--- a/bin/disk-image-get-kernel
+++ b/bin/disk-image-get-kernel
@@ -68,6 +68,8 @@ source $_LIB/img-functions
 
 echo "Extracting kernel + ramdisk from $IMAGE_FILE and writing them to $OUT_DIR"
 
+ensure_nbd
+
 # sets WORK_DIR
 mount_qcow_image $IMAGE_FILE