diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-16 21:06:28 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-16 21:06:28 -0400 |
| commit | 1dd9102afda920d486a144b3153d6c9951f45cf9 (patch) | |
| tree | 5bac4499a2d8ccd8fea3763bb9939c902f20a7b7 /upstart/cloud-init-blocknet.conf | |
| parent | 14c88d8c28a044776d011ed507f8f6465ec3e2c7 (diff) | |
| download | vyos-cloud-init-1dd9102afda920d486a144b3153d6c9951f45cf9.tar.gz vyos-cloud-init-1dd9102afda920d486a144b3153d6c9951f45cf9.zip | |
fix regression when command line (ds=nocloud) is present
parsing the command line parameters returned a dictionary
but _merge_new_seed was expecting a string to be yaml loaded.
Change is to make _merge_new_seed take either string or dict.
Diffstat (limited to 'upstart/cloud-init-blocknet.conf')
0 files changed, 0 insertions, 0 deletions