summaryrefslogtreecommitdiff
path: root/tools/ds-identify
diff options
context:
space:
mode:
authorJames Falcon <TheRealFalcon@users.noreply.github.com>2020-08-07 10:19:09 -0500
committerGitHub <noreply@github.com>2020-08-07 11:19:09 -0400
commitc068f992c3905d07732dafa6eb61c1ae3aa65916 (patch)
tree6a58935c6660b3446020d205f098f3aeee9377a2 /tools/ds-identify
parentb2bf538b8c355b1bf04657fafc717ad20779e4a4 (diff)
downloadvyos-cloud-init-c068f992c3905d07732dafa6eb61c1ae3aa65916.tar.gz
vyos-cloud-init-c068f992c3905d07732dafa6eb61c1ae3aa65916.zip
Recognize LABEL_FATBOOT labels (#513)
Update DataSourceNoCloud and ds-identify to recognize LABEL_FATBOOT labels from blkid. Also updated associated tests. LP: #1841466
Diffstat (limited to 'tools/ds-identify')
-rwxr-xr-xtools/ds-identify5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/ds-identify b/tools/ds-identify
index 071cdc0c..4e5700fc 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -266,8 +266,9 @@ read_fs_info() {
isodevs="${isodevs},${dev}=$label"
ftype=""; dev=""; label="";
dev=${line#DEVNAME=};;
- LABEL=*) label="${line#LABEL=}";
- labels="${labels}${line#LABEL=}${delim}";;
+ LABEL=*|LABEL_FATBOOT=*)
+ label="${line#*=}";
+ labels="${labels}${label}${delim}";;
TYPE=*) ftype=${line#TYPE=};;
UUID=*) uuids="${uuids}${line#UUID=}$delim";;
esac