Commit b917ef75 by Natanael Copa Committed by Stéphane Graber

lxc-info: add option -t, --state-is=STATE to test for a given test

Add an option to test for a give state. This is useful for scripts. It lets us you do thing like: if lxc-info --name myname --state-is RUNNING; then ... Signed-off-by: 's avatarNatanael Copa <ncopa@alpinelinux.org> Acked-by: 's avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
parent 83cab6e0
...@@ -34,12 +34,14 @@ ...@@ -34,12 +34,14 @@
static bool state; static bool state;
static bool pid; static bool pid;
static char *test_state = NULL;
static int my_parser(struct lxc_arguments* args, int c, char* arg) static int my_parser(struct lxc_arguments* args, int c, char* arg)
{ {
switch (c) { switch (c) {
case 's': state = true; break; case 's': state = true; break;
case 'p': pid = true; break; case 'p': pid = true; break;
case 't': test_state = arg; break;
} }
return 0; return 0;
} }
...@@ -47,6 +49,7 @@ static int my_parser(struct lxc_arguments* args, int c, char* arg) ...@@ -47,6 +49,7 @@ static int my_parser(struct lxc_arguments* args, int c, char* arg)
static const struct option my_longopts[] = { static const struct option my_longopts[] = {
{"state", no_argument, 0, 's'}, {"state", no_argument, 0, 's'},
{"pid", no_argument, 0, 'p'}, {"pid", no_argument, 0, 'p'},
{"state-is", required_argument, 0, 't'},
LXC_COMMON_OPTIONS, LXC_COMMON_OPTIONS,
}; };
...@@ -60,7 +63,9 @@ lxc-info display some information about a container with the identifier NAME\n\ ...@@ -60,7 +63,9 @@ lxc-info display some information about a container with the identifier NAME\n\
Options :\n\ Options :\n\
-n, --name=NAME NAME for name of the container\n\ -n, --name=NAME NAME for name of the container\n\
-s, --state shows the state of the container\n\ -s, --state shows the state of the container\n\
-p, --pid shows the process id of the init container\n", -p, --pid shows the process id of the init container\n\
-t, --state-is=STATE test if current state is STATE\n\
returns success if it matches, false otherwise\n",
.options = my_longopts, .options = my_longopts,
.parser = my_parser, .parser = my_parser,
.checker = NULL, .checker = NULL,
...@@ -81,10 +86,12 @@ int main(int argc, char *argv[]) ...@@ -81,10 +86,12 @@ int main(int argc, char *argv[])
if (!state && !pid) if (!state && !pid)
state = pid = true; state = pid = true;
if (state) { if (state || test_state) {
ret = lxc_getstate(my_args.name); ret = lxc_getstate(my_args.name);
if (ret < 0) if (ret < 0)
return 1; return 1;
if (test_state)
return strcmp(lxc_state2str(ret), test_state) != 0;
printf("state:%10s\n", lxc_state2str(ret)); printf("state:%10s\n", lxc_state2str(ret));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment