diff options
| author | James Penick <penick@yahoo-inc.com> | 2018-01-23 14:22:54 -0700 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-01-23 14:22:54 -0700 |
| commit | eb70975eaf37cf9549949f72e7647addb81a52ac (patch) | |
| tree | feb34168c0e896509f088ee81b017ca47aea823a /tools/ds-identify | |
| parent | 5cc0b19b851a42f6a5edb0cc9d49dd76891b1bcb (diff) | |
| download | vyos-cloud-init-eb70975eaf37cf9549949f72e7647addb81a52ac.tar.gz vyos-cloud-init-eb70975eaf37cf9549949f72e7647addb81a52ac.zip | |
Recognize uppercase vfat disk labels
New mkfs.vfat and fatlabel tools included in the dosfsutils package no
longer support creating vfat disks with lowercase labels. They silently
default to an all uppercase label eg CONFIG-2 instead of config-2. This
change makes cloud-init handle either upper or lower case.
LP: #1598783
Diffstat (limited to 'tools/ds-identify')
| -rwxr-xr-x | tools/ds-identify | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/ds-identify b/tools/ds-identify index 5893a761..374c3ad1 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -579,6 +579,8 @@ dscheck_NoCloud() { check_configdrive_v2() { if has_fs_with_label "config-2"; then return ${DS_FOUND} + elif has_fs_with_label "CONFIG-2"; then + return ${DS_FOUND} fi # look in /config-drive <vlc>/seed/config_drive for a directory # openstack/YYYY-MM-DD format with a file meta_data.json @@ -666,7 +668,7 @@ is_cdrom_ovf() { # explicitly skip known labels of other types. rd_rdfe is azure. case "$label" in - config-2|rd_rdfe_stable*|cidata) return 1;; + config-2|CONFIG-2|rd_rdfe_stable*|cidata) return 1;; esac local idstr="http://schemas.dmtf.org/ovf/environment/1" |