[lxc-devel] [lxd/master] Bugfixes

[stgraber on Github]

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/20170812/c1990e63/attachment.bin>
-------------- next part --------------
From 81d5e787ddf46a3791eb1989ae0619f149b1363a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 11 Aug 2017 15:16:08 -0400
Subject: [PATCH 1/2] doc: Fix bad JSON in rest-api.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3654

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 doc/rest-api.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/rest-api.md b/doc/rest-api.md
index b5c8f9a9c..3c4df4209 100644
--- a/doc/rest-api.md
+++ b/doc/rest-api.md
@@ -1402,8 +1402,8 @@ In the source image case, the following dict must be used:
         },
         "aliases": [                            # Set initial aliases ("image_create_aliases" API extension)
             {"name": "my-alias",
-             "description: "A description"
-        },
+             "description": "A description"}
+        ],
         "source": {
             "type": "image",
             "mode": "pull",                     # Only pull is supported for now
@@ -1427,8 +1427,8 @@ In the source container case, the following dict must be used:
         },
         "aliases": [                    # Set initial aliases ("image_create_aliases" API extension)
             {"name": "my-alias",
-             "description: "A description"
-        },
+             "description": "A description"}
+        ],
         "source": {
             "type": "container",        # One of "container" or "snapshot"
             "name": "abc"
@@ -1445,8 +1445,8 @@ In the remote image URL case, the following dict must be used:
         },
         "aliases": [                                    # Set initial aliases ("image_create_aliases" API extension)
             {"name": "my-alias",
-             "description: "A description"
-        },
+             "description": "A description"}
+        ],
         "source": {
             "type": "url",
             "url": "https://www.some-server.com/image"  # URL for the image

From a1173318fd424830fea6a86c19dd2555382bd960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 11 Aug 2017 15:25:54 -0400
Subject: [PATCH 2/2] networks: Set dnsmasq.raw to be 0644
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3652

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/networks.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxd/networks.go b/lxd/networks.go
index 608a91bf3..db25a2147 100644
--- a/lxd/networks.go
+++ b/lxd/networks.go
@@ -1187,7 +1187,7 @@ func (n *network) Start() error {
 		}
 
 		// Create a config file to contain additional config (and to prevent dnsmasq from reading /etc/dnsmasq.conf)
-		err = ioutil.WriteFile(shared.VarPath("networks", n.name, "dnsmasq.raw"), []byte(fmt.Sprintf("%s\n", n.config["raw.dnsmasq"])), 0)
+		err = ioutil.WriteFile(shared.VarPath("networks", n.name, "dnsmasq.raw"), []byte(fmt.Sprintf("%s\n", n.config["raw.dnsmasq"])), 0644)
 		if err != nil {
 			return err
 		}