openstack/diskimage-builder
Code Issues Proposed changes

Bad code landed, causing ubuntu to be always landed.

Browse Source 
Change-Id: Ia77073563fde70140169dbbc5a7448aad54295e2
This commit is contained in:
Robert Collins 2013-02-13 13:58:35 +13:00
parent b98e8d1b3f
commit 8220c00095
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/img-functions
View File

@ -62,8 +62,7 @@ function mount_tmp_image () {
function create_base () {
# Copy data in to the root.
TARGET_ROOT=$TMP_MOUNT_PATH run_d root
if [ -z "$(ls /tmp/foo)" ] ; then
if [ -z "$(ls $TMP_MOUNT_PATH | grep -v lost+found)" ] ; then
# Nothing copied in, use Ubuntu.
echo "Adding ubuntu element as / had no contents"
IMAGE_ELEMENT=$($SCRIPT_HOME/element-info --expand-dependencies $IMAGE_ELEMENT ubuntu)