X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=cirros-testvm%2Fsrc-cirros%2Fsrc%2Flib%2Fcirros%2Fds%2Fconfigdrive;h=e2385038287912960289dd7fbfa8d06d8be38ab2;hb=refs%2Fheads%2Fmaster;hp=9bc201d0ba96db12f8a52b7f393263e380338659;hpb=0ecd1ca6dabb09156b30c5f4b63f46a449a57333;p=packages%2Ftrusty%2Fcirros-testvm.git

diff --git a/cirros-testvm/src-cirros/src/lib/cirros/ds/configdrive b/cirros-testvm/src-cirros/src/lib/cirros/ds/configdrive
index 9bc201d..e238503 100755
--- a/cirros-testvm/src-cirros/src/lib/cirros/ds/configdrive
+++ b/cirros-testvm/src-cirros/src/lib/cirros/ds/configdrive
@@ -4,6 +4,7 @@ VERBOSITY=0
 CONFIG=/etc/cirros-init/configdrive
 NAME="${0##*/}"
 LABEL="config-2"
+LABEL_ALT="CONFIG-2"
 SEED_PRE_D="/var/lib/cloud/seed/configdrive-pre"
 SEED_POST_D="/var/lib/cloud/seed/configdrive"
 
@@ -22,7 +23,8 @@ search_local() {
 	local out_d="$1"
 	local devlist="" num="" found="" fstree_d=""
 	local raw_d="" dev="" rdir="" mdjson="" ud="" found=""
-	find_devs_with "LABEL=$LABEL" ||
+	find_devs_with "LABEL=$LABEL" && [ -n "${_RET}" ] ||
+                find_devs_with "LABEL=$LABEL_ALT" ||
 		{ error "failed to find devs"; return 1; }
 
 	devlist=${_RET}
@@ -61,7 +63,7 @@ search_local() {
 		if [ -f "$mdjson" ]; then
 			json2fstree "$fstree_d" "$mdjson" ||
 				fail "json2fstree failed on $mdjson for $dev"
-			ud="$rdir/openstack/latest/user_data" 
+			ud="$rdir/openstack/latest/user_data"
 			[ -f "$ud" ] && cp "$ud" "$fstree_d/user-data"
 			found="$dev"
 			mv "$rdir" "$raw_d" ||