diff options
| author | Daniel Golle | 2020-04-12 18:31:36 +0000 |
|---|---|---|
| committer | Daniel Golle | 2020-04-12 18:51:50 +0000 |
| commit | b275a6299e8b1c2e2afcca02a5c333cd3ea60f09 (patch) | |
| tree | 1c3e17b8b708e629e1583dc89c3856cb20e28406 | |
| parent | 32c717e18ee3f73a68ac854cfc5ba9e7cbf8c3b1 (diff) | |
| download | procd-b275a6299e8b1c2e2afcca02a5c333cd3ea60f09.tar.gz | |
instance: harmonize instance API
Move attributes in generated output to match their place in the
expected input.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -rw-r--r-- | service/instance.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/service/instance.c b/service/instance.c index c941157..47d563c 100644 --- a/service/instance.c +++ b/service/instance.c @@ -1323,12 +1323,6 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose) blobmsg_add_string(b, "name", in->jail.name); if (in->jail.hostname) blobmsg_add_string(b, "hostname", in->jail.hostname); - if (in->extroot) - blobmsg_add_string(b, "extroot", in->extroot); - if (in->overlaydir) - blobmsg_add_string(b, "overlaydir", in->overlaydir); - if (in->tmpoverlaysize) - blobmsg_add_string(b, "tmpoverlaysize", in->tmpoverlaysize); blobmsg_add_u8(b, "procfs", in->jail.procfs); blobmsg_add_u8(b, "sysfs", in->jail.sysfs); @@ -1348,6 +1342,13 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose) } } + if (in->extroot) + blobmsg_add_string(b, "extroot", in->extroot); + if (in->overlaydir) + blobmsg_add_string(b, "overlaydir", in->overlaydir); + if (in->tmpoverlaysize) + blobmsg_add_string(b, "tmpoverlaysize", in->tmpoverlaysize); + if (verbose && in->trigger) blobmsg_add_blob(b, in->trigger); |