diff options
| author | Roger Pau Monne <roger.pau@citrix.com> | 2013-03-13 17:42:17 +0000 |
|---|---|---|
| committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2013-03-15 12:40:47 +0000 |
| commit | 733b9c524dbc2bec318bfc3588ed1652455d30ec (patch) | |
| tree | bd928fc3b5cf2ebf6c93ebe8938880b273e6e20a | |
| parent | e66be7e48421f0a67f29dd7d572d42c7627807c7 (diff) | |
| download | xen-733b9c524dbc2bec318bfc3588ed1652455d30ec.tar.gz xen-733b9c524dbc2bec318bfc3588ed1652455d30ec.tar.bz2 xen-733b9c524dbc2bec318bfc3588ed1652455d30ec.zip | |
xl: add vif.default.script
Replace vifscript with vif.default.script. The old config option is
kept for backwards compatibility.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Cc: George Dunlap <george.dunlap@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
| -rw-r--r-- | docs/man/xl.conf.pod.5 | 4 | ||||
| -rw-r--r-- | tools/libxl/xl.c | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/docs/man/xl.conf.pod.5 b/docs/man/xl.conf.pod.5 index 31aebcaa90..7b9fcac2fa 100644 --- a/docs/man/xl.conf.pod.5 +++ b/docs/man/xl.conf.pod.5 @@ -70,10 +70,12 @@ operations (primarily domain creation). Default: C</var/lock/xl> -=item B<vifscript="PATH"> +=item B<vif.default.script="PATH"> Configures the default hotplug script used by virtual network devices. +The old B<vifscript> option is deprecated and should not be used. + Default: C</etc/xen/scripts/vif-bridge> =item B<vif.default.bridge="NAME"> diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index 9f45e4559f..4c598dbbad 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -96,8 +96,17 @@ static void parse_global_config(const char *configfile, * different device kinds. */ - if (!xlu_cfg_get_string (config, "vifscript", &buf, 0)) + if (!xlu_cfg_get_string (config, "vifscript", &buf, 0)) { + fprintf(stderr, "the global config option vifscript is deprecated, " + "please switch to vif.default.script\n"); + free(default_vifscript); default_vifscript = strdup(buf); + } + + if (!xlu_cfg_get_string (config, "vif.default.script", &buf, 0)) { + free(default_vifscript); + default_vifscript = strdup(buf); + } if (!xlu_cfg_get_string (config, "defaultbridge", &buf, 0)) { fprintf(stderr, "the global config option defaultbridge is deprecated, " |