From 3aa8f359be61e37465cdf5eb2df55c2d9cc7e988 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 31 May 2017 08:49:07 +0200 Subject: [PATCH] confile: add getter for lxc.rebootsignal Signed-off-by: Christian Brauner --- src/lxc/confile.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/lxc/confile.c b/src/lxc/confile.c index 371aad9bf..73e9eacf6 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -174,6 +174,8 @@ static int set_config_haltsignal(const char *, const char *, struct lxc_conf *); static int get_config_haltsignal(struct lxc_container *, const char *, char *, int); static int set_config_rebootsignal(const char *, const char *, struct lxc_conf *); +static int get_config_rebootsignal(struct lxc_container *, const char *, char *, int); + static int set_config_stopsignal(const char *, const char *, struct lxc_conf *); static int set_config_start(const char *, const char *, struct lxc_conf *); static int set_config_syslog(const char *, const char *, struct lxc_conf *); @@ -244,7 +246,7 @@ static struct lxc_config_t config[] = { { "lxc.include", set_config_includefile, NULL, NULL}, { "lxc.autodev", set_config_autodev, get_config_autodev, NULL}, { "lxc.haltsignal", set_config_haltsignal, get_config_haltsignal, NULL}, - { "lxc.rebootsignal", set_config_rebootsignal, NULL, NULL}, + { "lxc.rebootsignal", set_config_rebootsignal, get_config_rebootsignal, NULL}, { "lxc.stopsignal", set_config_stopsignal, NULL, NULL}, { "lxc.start.auto", set_config_start, NULL, NULL}, { "lxc.start.delay", set_config_start, NULL, NULL}, @@ -2762,8 +2764,6 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv, return lxc_get_limit_entry(c, retv, inlen, "all"); else if (strncmp(key, "lxc.limit.", 10) == 0) // specific limit return lxc_get_limit_entry(c, retv, inlen, key + 10); - else if (strcmp(key, "lxc.rebootsignal") == 0) - return lxc_get_conf_int(c, retv, inlen, c->rebootsignal); else if (strcmp(key, "lxc.stopsignal") == 0) return lxc_get_conf_int(c, retv, inlen, c->stopsignal); else return -1; @@ -3923,3 +3923,10 @@ static int get_config_haltsignal(struct lxc_container *c, const char *key, return lxc_get_conf_int(c->lxc_conf, retv, inlen, c->lxc_conf->haltsignal); } + +static int get_config_rebootsignal(struct lxc_container *c, const char *key, + char *retv, int inlen) +{ + return lxc_get_conf_int(c->lxc_conf, retv, inlen, + c->lxc_conf->rebootsignal); +}