diff options
| author | Scott Moser <smoser@ubuntu.com> | 2017-02-10 13:44:32 -0600 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2017-02-10 14:00:35 -0600 |
| commit | e6098c2cd0a1786ba5b34b603247b4ef644e2312 (patch) | |
| tree | 06b27353aa864c2f96726590f9bc738a37952ec4 /tools/ds-identify | |
| parent | 0df21b6ea89697e8700ad51158327533aa573c91 (diff) | |
| download | vyos-cloud-init-e6098c2cd0a1786ba5b34b603247b4ef644e2312.tar.gz vyos-cloud-init-e6098c2cd0a1786ba5b34b603247b4ef644e2312.zip | |
ds-identify: read ds=nocloud properly
The nocloud datasource specifically would look for ds=nocloud or
ds=nocloud-net (often augmented with 'seedfrom') on the kernel command line.
Fix to return DS_FOUND in that case.
LP: #1663723
Diffstat (limited to 'tools/ds-identify')
| -rwxr-xr-x | tools/ds-identify | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/ds-identify b/tools/ds-identify index 88094af7..e454ed6d 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -514,6 +514,9 @@ dscheck_MAAS() { dscheck_NoCloud() { local fslabel="cidata" d="" + case " ${DI_KERNEL_CMDLINE} " in + *\ ds=nocloud*) return ${DS_FOUND};; + esac for d in nocloud nocloud-net; do check_seed_dir "$d" meta-data user-data && return ${DS_FOUND} done |