[lxc-devel] [lxd/master] lxd/instance/drivers: Fix lxd-agent running order

[monstermunchkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 458 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200325/8917997c/attachment.bin>
-------------- next part --------------
From bf8cdc9b72637cf522686d848da94bfbeb776bb9 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Wed, 25 Mar 2020 17:38:37 +0100
Subject: [PATCH] lxd/instance/drivers: Fix lxd-agent running order

This ensures that the lxd-agent is started before cloud-init.service and
cloud-init-local.service.

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 lxd/instance/drivers/driver_qemu.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxd/instance/drivers/driver_qemu.go b/lxd/instance/drivers/driver_qemu.go
index d89ff7d6eb..642df0545c 100644
--- a/lxd/instance/drivers/driver_qemu.go
+++ b/lxd/instance/drivers/driver_qemu.go
@@ -1271,7 +1271,7 @@ Documentation=https://linuxcontainers.org/lxd
 ConditionPathExists=/dev/virtio-ports/org.linuxcontainers.lxd
 Requires=lxd-agent-9p.service
 After=lxd-agent-9p.service
-Before=cloud-init.target
+Before=cloud-init.target cloud-init.service cloud-init-local.service
 
 [Service]
 Type=simple