The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/2517
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
From 8788e6a6dfc50ce8ac58255d3b0e1c91c5076375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@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 <stgra...@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}
}
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
