[lxc-devel] [lxd/master] lxd/device/disk: Fixes cloud-init errors for VMs

tomponline on Github lxc-bot at linuxcontainers.org
Fri Jun 26 17:09:39 UTC 2020


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 376 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200626/01b8f485/attachment.bin>
-------------- next part --------------
From 7ea6e47995bac2a0a16f07180d85be50362083cc Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parrott at canonical.com>
Date: Fri, 26 Jun 2020 18:08:55 +0100
Subject: [PATCH] lxd/device/disk: Fixes cloud-init errors for VMs

Fixes #7587

Signed-off-by: Thomas Parrott <thomas.parrott at canonical.com>
---
 lxd/device/disk.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lxd/device/disk.go b/lxd/device/disk.go
index 10ab81fde0..a67adf430b 100644
--- a/lxd/device/disk.go
+++ b/lxd/device/disk.go
@@ -1530,10 +1530,10 @@ func (d *disk) generateVMConfigDrive() (string, error) {
 
 	instanceConfig := d.inst.ExpandedConfig()
 
-	// Use an empty user-data file if no custom vendor-data supplied.
+	// Use an empty vendor-data file if no custom vendor-data supplied.
 	vendorData := instanceConfig["user.vendor-data"]
 	if vendorData == "" {
-		vendorData = "#cloud-config"
+		vendorData = "#cloud-config\n{}"
 	}
 
 	err = ioutil.WriteFile(filepath.Join(scratchDir, "vendor-data"), []byte(vendorData), 0400)
@@ -1544,7 +1544,7 @@ func (d *disk) generateVMConfigDrive() (string, error) {
 	// Use an empty user-data file if no custom user-data supplied.
 	userData := instanceConfig["user.user-data"]
 	if userData == "" {
-		userData = "#cloud-config"
+		userData = "#cloud-config\n{}"
 	}
 
 	err = ioutil.WriteFile(filepath.Join(scratchDir, "user-data"), []byte(userData), 0400)


More information about the lxc-devel mailing list