openstack/deb-python-diskimage-builder
Code Issues Proposed changes

Move the ensure_nbd function call.

Browse Source 
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
This commit is contained in:
Lucas Alvares Gomes
2013-05-20 11:59:21 +01:00
parent fb246a02eb
commit 85b5ef0c8d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/disk-image-create
View File

@@ -92,9 +92,6 @@ IMAGE_ELEMENT=$($SCRIPT_HOME/element-info --expand-dependencies $IMAGE_ELEMENT)
echo "Building elements: $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." 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 mk_build_dir
create_base create_base
run_d extra-data run_d extra-data

2
bin/disk-image-get-kernel
View File

@@ -68,6 +68,8 @@ source $_LIB/img-functions
echo "Extracting kernel + ramdisk from $IMAGE_FILE and writing them to $OUT_DIR" echo "Extracting kernel + ramdisk from $IMAGE_FILE and writing them to $OUT_DIR"
ensure_nbd
# sets WORK_DIR # sets WORK_DIR
mount_qcow_image $IMAGE_FILE mount_qcow_image $IMAGE_FILE