openstack/diskimage-builder
Code Issues Proposed changes

Always include the in-tree elements directory.

Browse Source 
Change-Id: I5a79fbf0568f5755dd14824ed147093387170b3f
This commit is contained in:
Robert Collins 2013-04-08 10:26:44 +12:00
parent e826e77a16
commit 24c89932be
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -272,7 +272,8 @@ get help.
Using the variable ELEMENTS\_PATH will allow to specify multiple elements locations. Using the variable ELEMENTS\_PATH will allow to specify multiple elements locations.
It's a colon (:) separated path list, and it will work in a first path/element found, It's a colon (:) separated path list, and it will work in a first path/element found,
first served approach. first served approach. The included elements tree is used when no path is supplied,
and is added to the end of the path if a path is supplied.
Copyright Copyright
========= =========

4
lib/img-defaults
View File

@ -22,4 +22,6 @@ IMAGE_NAME=${IMAGE_NAME:-image}
export IMAGE_SIZE=${IMAGE_SIZE:-2} # N.B. This size is in GB export IMAGE_SIZE=${IMAGE_SIZE:-2} # N.B. This size is in GB
# Set via the CLI normally. # Set via the CLI normally.
# IMAGE_ELEMENT= # IMAGE_ELEMENT=
export ELEMENTS_PATH=${ELEMENTS_PATH:-$(dirname $0)/../elements} _BASE_ELEMENT_DIR=$(dirname $0)/../elements
ELEMENTS_PATH=${ELEMENTS_PATH:+"$ELEMENTS_PATH:$_BASE_ELEMENT_DIR"}
export ELEMENTS_PATH=${ELEMENTS_PATH:-$_BASE_ELEMENT_DIR}

4
lib/ramdisk-defaults
View File

@ -21,4 +21,6 @@ MODULE_ROOT=${MODULE_ROOT:-""}
LIB_UDEV_ROOT=${LIB_UDEV_ROOT:-""} LIB_UDEV_ROOT=${LIB_UDEV_ROOT:-""}
BUSYBOX=${BUSYBOX:-$(which busybox)} BUSYBOX=${BUSYBOX:-$(which busybox)}
IMAGE_NAME=${IMAGE_NAME:-"ramdisk"} IMAGE_NAME=${IMAGE_NAME:-"ramdisk"}
export ELEMENTS_PATH=${ELEMENTS_PATH:-$(dirname $0)/../elements} _BASE_ELEMENT_DIR=$(dirname $0)/../elements
ELEMENTS_PATH=${ELEMENTS_PATH:+"$ELEMENTS_PATH:$_BASE_ELEMENT_DIR"}
export ELEMENTS_PATH=${ELEMENTS_PATH:-$_BASE_ELEMENT_DIR}