[lxc-devel] [lxd/master] Announce LXD in SMBIOS for VMs

stgraber on Github lxc-bot at linuxcontainers.org
Fri Apr 24 22:11:18 UTC 2020


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200424/f89dafa9/attachment.bin>
-------------- next part --------------
From 30a66cc0fe4c00fc4c7a7ecefc34f5715e28ca19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 23 Apr 2020 18:02:12 -0400
Subject: [PATCH 1/2] lxd/daemon: Remove duplicated logic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/daemon.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lxd/daemon.go b/lxd/daemon.go
index 354fb8d67d..4f26b29d93 100644
--- a/lxd/daemon.go
+++ b/lxd/daemon.go
@@ -1158,9 +1158,6 @@ func (d *Daemon) Stop() error {
 	if d.gateway != nil {
 		trackError(d.gateway.Shutdown())
 	}
-	if d.endpoints != nil {
-		trackError(d.endpoints.Down())
-	}
 
 	if d.endpoints != nil {
 		trackError(d.endpoints.Down())

From d51600eed7ca1160f8d93d02be41687413d3d144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 24 Apr 2020 18:10:51 -0400
Subject: [PATCH 2/2] lxd/instance/qemu: Announce LXD in SMBIOS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.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 1d1b7fbce5..b92b08f6f3 100644
--- a/lxd/instance/drivers/driver_qemu.go
+++ b/lxd/instance/drivers/driver_qemu.go
@@ -733,6 +733,10 @@ func (vm *qemu) Start(stateful bool) error {
 		"-chroot", vm.Path(),
 	}
 
+	if vm.architecture != osarch.ARCH_64BIT_POWERPC_LITTLE_ENDIAN {
+		qemuCmd = append(qemuCmd, "-smbios", "type=2,manufacturer=Canonical Ltd.,product=LXD")
+	}
+
 	// Attempt to drop privileges.
 	if vm.state.OS.UnprivUser != "" {
 		qemuCmd = append(qemuCmd, "-runas", vm.state.OS.UnprivUser)


More information about the lxc-devel mailing list