The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/3701

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 <[email protected]>
From 9dc8d10e5248a822bcc8e2ae3caf64452ffbd52b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <[email protected]>
Date: Mon, 21 Aug 2017 23:49:17 -0400
Subject: [PATCH] Another LXC 2.1 key rename, lxc.idmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <[email protected]>
---
 lxd/container_lxc.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lxd/container_lxc.go b/lxd/container_lxc.go
index de32f1b28..07d972613 100644
--- a/lxd/container_lxc.go
+++ b/lxd/container_lxc.go
@@ -146,6 +146,8 @@ func lxcSetConfigItem(c *lxc.Container, key string, value 
string) error {
                        key = "lxc.init_uid"
                case "lxc.init.gid":
                        key = "lxc.init_gid"
+               case "lxc.idmap":
+                       key = "lxc.id_map"
                }
        }
 
@@ -1038,7 +1040,7 @@ func (c *containerLXC) initLXC() error {
        if idmapset != nil {
                lines := idmapset.ToLxcString()
                for _, line := range lines {
-                       err := lxcSetConfigItem(cc, "lxc.id_map", 
strings.TrimSuffix(line, "\n"))
+                       err := lxcSetConfigItem(cc, "lxc.idmap", 
strings.TrimSuffix(line, "\n"))
                        if err != nil {
                                return err
                        }
_______________________________________________
lxc-devel mailing list
[email protected]
http://lists.linuxcontainers.org/listinfo/lxc-devel

Reply via email to