diff options
| author | James Falcon <TheRealFalcon@users.noreply.github.com> | 2020-08-07 10:19:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 11:19:09 -0400 |
| commit | c068f992c3905d07732dafa6eb61c1ae3aa65916 (patch) | |
| tree | 6a58935c6660b3446020d205f098f3aeee9377a2 /tools | |
| parent | b2bf538b8c355b1bf04657fafc717ad20779e4a4 (diff) | |
| download | vyos-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')
| -rw-r--r-- | tools/.github-cla-signers | 1 | ||||
| -rwxr-xr-x | tools/ds-identify | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers index ae2fae91..5f4dc79b 100644 --- a/tools/.github-cla-signers +++ b/tools/.github-cla-signers @@ -7,6 +7,7 @@ dhensby eandersson landon912 lucasmoura +marlluslustosa matthewruffell nishigori onitake 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 |