[lxc-devel] [distrobuilder/master] generators/lxd-agent: Add trans=virtio option

[monstermunchkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 364 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200304/5f302989/attachment.bin>
-------------- next part --------------
From 2f3224a2c7698a4b97bd3c737864c689cc01a054 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Wed, 4 Mar 2020 16:24:49 +0100
Subject: [PATCH] generators/lxd-agent: Add trans=virtio option

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 generators/lxd-agent.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generators/lxd-agent.go b/generators/lxd-agent.go
index 9f1b684..d415b55 100644
--- a/generators/lxd-agent.go
+++ b/generators/lxd-agent.go
@@ -106,7 +106,7 @@ RemainAfterExit=yes
 ExecStartPre=-/sbin/modprobe 9pnet_virtio
 ExecStartPre=/bin/mkdir -p /run/lxd_config/9p
 ExecStartPre=/bin/chmod 0700 /run/lxd_config/
-ExecStart=/bin/mount -t 9p config /run/lxd_config/9p -o access=0
+ExecStart=/bin/mount -t 9p config /run/lxd_config/9p -o access=0,trans=virtio
 
 [Install]
 WantedBy=multi-user.target
@@ -152,7 +152,7 @@ depend() {
 
 description="LXD - agent - 9p mount"
 command=/bin/mount
-command_args="-t 9p config /run/lxd_config/9p -o access=0"
+command_args="-t 9p config /run/lxd_config/9p -o access=0,trans=virtio"
 required_files=/dev/virtio-ports/org.linuxcontainers.lxd
 
 start_pre() {
@@ -208,7 +208,7 @@ end script
 
 task
 
-exec mount -t 9p config /run/lxd_config/9p -o access=0
+exec mount -t 9p config /run/lxd_config/9p -o access=0,trans=virtio
 `
 
 	err = ioutil.WriteFile(filepath.Join(sourceDir, "/etc/init/lxd-agent-9p"), []byte(lxdConfigShareMountScript), 0755)