Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

vzctl: do not warn about valid config parameters

Previous commit e0edb7c made it possible to make vzctl whine about
unknown parameters in configuration files. Apparently, there are quite
a few parameters that are pretty valid but not used by vzctl.

List such parameters in config[] to avoid "false positives",
reducing the noise.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
  • Loading branch information...
commit de8b7f63b364713a962edd8eb642108fd12c5dcb 1 parent e0edb7c
Kirill Kolyshkin kolyshkin authored
Showing with 16 additions and 0 deletions.
  1. +1 −0  include/vzctl_param.h
  2. +15 −0 src/lib/config.c
1  include/vzctl_param.h
View
@@ -18,6 +18,7 @@
#ifndef _VZCTL_PARAM_H_
#define _VZCTL_PARAM_H_
+#define PARAM_IGNORED -1
/* UB */
#define PARAM_KMEMSIZE 'k'
#define PARAM_LOCKEDPAGES 'l'
15 src/lib/config.c
View
@@ -141,6 +141,18 @@ static vps_config config[] = {
{"IOPRIO", NULL, PARAM_IOPRIO},
{"BOOTORDER", NULL, PARAM_BOOTORDER},
+/* These ones are known parameters for global config file,
+ * it's just vzctl is not interested in those
+ */
+{"VIRTUOZZO", NULL, PARAM_IGNORED},
+{"VE0CPUUNITS", NULL, PARAM_IGNORED},
+{"VZFASTBOOT", NULL, PARAM_IGNORED},
+{"NEIGHBOUR_DEVS", NULL, PARAM_IGNORED},
+{"ERROR_ON_ARPFAIL", NULL, PARAM_IGNORED},
+{"VZWDOG", NULL, PARAM_IGNORED},
+{"IPTABLES_MODULES", NULL, PARAM_IGNORED},
+{"IP6TABLES", NULL, PARAM_IGNORED},
+
{NULL, NULL, -1}
};
@@ -2066,6 +2078,9 @@ static int parse(envid_t veid, vps_param *vps_p, char *val, int id)
case PARAM_BOOTORDER:
ret = conf_parse_ulong(&vps_p->res.misc.bootorder, val);
break;
+ case PARAM_IGNORED:
+ /* Well known but ignored parameter */
+ break;
default:
logger(10, 0, "Not handled parameter %d %s", id, val);
break;
Please sign in to comment.
Something went wrong with that request. Please try again.