--- src/lib/cirros/ds/configdrive	2013-05-12 01:37:38 +0000
+++ src/lib/cirros/ds/configdrive	2016-06-02 10:31:01 +0000
@@ -4,6 +4,7 @@
 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,10 +23,17 @@
 	local out_d="$1"
 	local devlist="" num="" found="" fstree_d=""
 	local raw_d="" dev="" rdir="" mdjson="" ud="" found=""
+
+	devlist=""
+
 	find_devs_with "LABEL=$LABEL" ||
 		{ error "failed to find devs"; return 1; }
-
-	devlist=${_RET}
+	devlist+="${_RET}"
+
+	find_devs_with "LABEL=$LABEL_ALT" ||
+		{ error "failed to find devs"; return 1; }
+	devlist+=" ${_RET}"
+
 	[ -n "$devlist" ] || { debug 1 "no devices labeled $LABEL"; exit 0; }
 
 	if [ -d "${SEED_PRE_D}" ]; then