[lxc-devel] [lxd/master] Fix typo in nictype value for -n

stgraber on Github lxc-bot at linuxcontainers.org
Tue Oct 18 05:48:25 UTC 2016


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20161018/6e198e6c/attachment.bin>
-------------- next part --------------
From 8788e6a6dfc50ce8ac58255d3b0e1c91c5076375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 18 Oct 2016 01:48:09 -0400
Subject: [PATCH] Fix typo in nictype value for -n
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>
---
 lxc/init.go   | 2 +-
 lxc/launch.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lxc/init.go b/lxc/init.go
index 80aafbf..315fa71 100644
--- a/lxc/init.go
+++ b/lxc/init.go
@@ -190,7 +190,7 @@ func (c *initCmd) run(config *lxd.Config, args []string) error {
 		}
 
 		if network.Type == "bridge" {
-			devicesMap[c.network] = shared.Device{"type": "nic", "nictype": "bridge", "parent": c.network}
+			devicesMap[c.network] = shared.Device{"type": "nic", "nictype": "bridged", "parent": c.network}
 		} else {
 			devicesMap[c.network] = shared.Device{"type": "nic", "nictype": "macvlan", "parent": c.network}
 		}
diff --git a/lxc/launch.go b/lxc/launch.go
index 425011e..439302c 100644
--- a/lxc/launch.go
+++ b/lxc/launch.go
@@ -87,7 +87,7 @@ func (c *launchCmd) run(config *lxd.Config, args []string) error {
 		}
 
 		if network.Type == "bridge" {
-			devicesMap[c.init.network] = shared.Device{"type": "nic", "nictype": "bridge", "parent": c.init.network}
+			devicesMap[c.init.network] = shared.Device{"type": "nic", "nictype": "bridged", "parent": c.init.network}
 		} else {
 			devicesMap[c.init.network] = shared.Device{"type": "nic", "nictype": "macvlan", "parent": c.init.network}
 		}


More information about the lxc-devel mailing list