Merge lp:~rpodolyaka/cirros/config-drive into lp:cirros

[Roman Podoliaka]

fixes https://bugs.launchpad.net/cirros/+bug/1598783

Unmerged revisions

370. By Roman Podoliaka on 2016-07-04

config drive: also check uppercase VFAT labels

Some dosfstools versions unconditionally produce uppercase FS label,
which are currently ignored by Cirros init system (but work with
cloud-init), thus, such config drives will not be found on VM boot.

while the config drive spec says that a lowercase label "config-2"
should be used, it does not go into details whether case-sensitive
or case-insesitive string comparison is expected.

We could easily make this work for CentOS / RHEL users, if we simply
checked for both "config-2" and "CONFIG-2" before giving up.

Closes-Bug: #1598783

=== modified file 'src/lib/cirros/ds/configdrive'
--- src/lib/cirros/ds/configdrive	2013-05-12 01:37:38 +0000
+++ src/lib/cirros/ds/configdrive	2016-07-04 13:13:30 +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,11 +23,19 @@
 	local out_d="$1"
 	local devlist="" num="" found="" fstree_d=""
 	local raw_d="" dev="" rdir="" mdjson="" ud="" found=""
-	find_devs_with "LABEL=$LABEL" ||
-		{ error "failed to find devs"; return 1; }
-
-	devlist=${_RET}
-	[ -n "$devlist" ] || { debug 1 "no devices labeled $LABEL"; exit 0; }
+
+	# according to the spec the label should be in lower case, but some
+	# dosfstools versions will produce an upper case value no matter what.
+	# Try both to account for that case (e.g. on RHEL 7.x)
+	for label in $LABEL $LABEL_ALT; do
+		find_devs_with "LABEL=$label" ||
+			{ error "failed to find devs"; return 1; }
+
+		devlist=${_RET}
+		[ -n "$devlist" ] && break || { debug 1 "no devices labeled $label"; continue; }
+	done
+
+	[ -n "$devlist" ] || { debug 1 "config drive device not found"; exit 0; }
 
 	if [ -d "${SEED_PRE_D}" ]; then
 		devlist="$SEED_PRE_D $devlist"