From 8220c0009594151dbee55d257f12c60bb17ee5d3 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Wed, 13 Feb 2013 13:58:35 +1300 Subject: [PATCH] Bad code landed, causing ubuntu to be always landed. Change-Id: Ia77073563fde70140169dbbc5a7448aad54295e2 --- lib/img-functions | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/img-functions b/lib/img-functions index fba3bf48..ddbbf7bd 100644 --- a/lib/img-functions +++ b/lib/img-functions @@ -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)