[lxc-devel] [lxd/master] Fix rest-api doc

stgraber on Github lxc-bot at linuxcontainers.org
Mon Jun 22 23:23:21 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/20200622/d825c3fb/attachment-0001.bin>
-------------- next part --------------
From 80732455698c64f3ae86639512fd21fa4f529c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 22 Jun 2020 18:26:33 -0400
Subject: [PATCH 1/2] doc/rest-api: Rename rootfs to root
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>
---
 doc/rest-api.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/rest-api.md b/doc/rest-api.md
index 34110c2596..9d91337516 100644
--- a/doc/rest-api.md
+++ b/doc/rest-api.md
@@ -743,7 +743,7 @@ Output:
     },
     "created_at": "2016-02-16T01:05:05Z",
     "devices": {
-        "rootfs": {
+        "root": {
             "path": "/",
             "type": "disk"
         }
@@ -794,7 +794,7 @@ Input (update instance configuration):
         "volatile.eth0.hwaddr": "00:16:3e:1c:94:38"
     },
     "devices": {
-        "rootfs": {
+        "root": {
             "path": "/",
             "type": "disk"
         }
@@ -833,7 +833,7 @@ Input:
         "limits.cpu": "4"
     },
     "devices": {
-        "rootfs": {
+        "root": {
             "size": "5GB"
         }
     },

From bac0e44b19121372d3ac92db72b0149acd973fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 22 Jun 2020 19:22:47 -0400
Subject: [PATCH 2/2] doc/rest-api: Fix instance PATCH example
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #7467

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

diff --git a/doc/rest-api.md b/doc/rest-api.md
index 9d91337516..37ada1eee4 100644
--- a/doc/rest-api.md
+++ b/doc/rest-api.md
@@ -834,6 +834,8 @@ Input:
     },
     "devices": {
         "root": {
+            "path": "/",
+            "pool": "default",
             "size": "5GB"
         }
     },


More information about the lxc-devel mailing list