Imported 2.649

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2020-03-05 20:20:23 +00:00
parent 21073315b6
commit 3351678f2e
2 changed files with 7 additions and 1 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.649) focal; urgency=medium
* Fix autoinstall-extracting runcmd in the case no user-data is passed.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 05 Mar 2020 15:36:25 +0100
livecd-rootfs (2.648) focal; urgency=medium
* Enable cloud-init in live server installer live session on all

View File

@ -126,6 +126,6 @@ runcmd:
user_data = yaml.safe_load(subprocess.run([
"cloud-init", "query", "userdata"],
check=True, stdout=subprocess.PIPE, encoding='utf-8').stdout)
if 'autoinstall' in user_data:
if user_data is not None and 'autoinstall' in user_data:
with open("/autoinstall.yaml", "w") as fp:
yaml.dump(user_data['autoinstall'], fp)