[lxc-devel] [lxd/master] VM: lxd-agent systemd dependency conflicts

[tomponline on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 852 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200331/2a613fae/attachment.bin>
-------------- next part --------------
From 582d8c8efec4640c7ba53a3b107ac4faf8e0080b Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parrott at canonical.com>
Date: Tue, 31 Mar 2020 10:23:36 +0100
Subject: [PATCH 1/2] lxd/instance/drivers/driver/qemu: Restart on failure

Matches commit https://github.com/lxc/distrobuilder/commit/84b7e319add95e32123fc46b032eb8004c6312a0

Signed-off-by: Thomas Parrott <thomas.parrott at canonical.com>
---
 lxd/instance/drivers/driver_qemu.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lxd/instance/drivers/driver_qemu.go b/lxd/instance/drivers/driver_qemu.go
index 506e71a0a0..00fe74fbd4 100644
--- a/lxd/instance/drivers/driver_qemu.go
+++ b/lxd/instance/drivers/driver_qemu.go
@@ -1277,6 +1277,10 @@ Before=cloud-init.target cloud-init.service cloud-init-local.service
 Type=simple
 WorkingDirectory=/run/lxd_config/9p
 ExecStart=/run/lxd_config/9p/lxd-agent
+Restart=on-failure
+RestartSec=5s
+StartLimitInterval=60
+StartLimitBurst=10
 
 [Install]
 WantedBy=multi-user.target

From 8069b457174848e55e39b893bf090d0567859782 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parrott at canonical.com>
Date: Tue, 31 Mar 2020 13:25:52 +0100
Subject: [PATCH 2/2] lxd/instance/drivers/driver/qemu: Fixes dependencies for
 lxd-agent

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

diff --git a/lxd/instance/drivers/driver_qemu.go b/lxd/instance/drivers/driver_qemu.go
index 00fe74fbd4..eada48e064 100644
--- a/lxd/instance/drivers/driver_qemu.go
+++ b/lxd/instance/drivers/driver_qemu.go
@@ -1272,6 +1272,7 @@ ConditionPathExists=/dev/virtio-ports/org.linuxcontainers.lxd
 Requires=lxd-agent-9p.service
 After=lxd-agent-9p.service
 Before=cloud-init.target cloud-init.service cloud-init-local.service
+DefaultDependencies=no
 
 [Service]
 Type=simple
@@ -1295,6 +1296,8 @@ WantedBy=multi-user.target
 Description=LXD - agent - 9p mount
 Documentation=https://linuxcontainers.org/lxd
 ConditionPathExists=/dev/virtio-ports/org.linuxcontainers.lxd
+Before=systemd-remount-fs.service
+DefaultDependencies=no
 
 [Service]
 Type=oneshot