diff options
author | Olaf Hering <olaf@aepfle.de> | 2021-01-11 18:41:51 +0100 |
---|---|---|
committer | Ian Jackson <iwj@xenproject.org> | 2021-02-08 16:22:00 +0000 |
commit | 53c8785b63a777902563394a93428030cbecf943 (patch) | |
tree | 1fa871070d0b5e5fe9091bd953b6def79e7a775b /docs | |
parent | 12e459742544fa0ef3260ec1cda7ea6fe2cd53bd (diff) |
Use XEN_SCRIPT_DIR to refer to /etc/xen/scripts
Replace all hardcoded paths to use XEN_SCRIPT_DIR to expand the actual
location.
[ .gitignore change split out -iwj ]
[ dropped erroneous hunk for docs/misc/block-scripts.txt iwj ]
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Reviewed-by: Ian Jackson <iwj@xenproject.org>
Release-Acked-by: Ian Jackson <iwj@xenproject.org>
Diffstat (limited to 'docs')
-rw-r--r-- | docs/configure.ac | 3 | ||||
-rw-r--r-- | docs/man/xl-disk-configuration.5.pod.in (renamed from docs/man/xl-disk-configuration.5.pod) | 2 | ||||
-rw-r--r-- | docs/man/xl-network-configuration.5.pod.in (renamed from docs/man/xl-network-configuration.5.pod) | 4 | ||||
-rw-r--r-- | docs/man/xl.1.pod.in | 2 | ||||
-rw-r--r-- | docs/man/xl.conf.5.pod.in (renamed from docs/man/xl.conf.5.pod) | 6 |
5 files changed, 10 insertions, 7 deletions
diff --git a/docs/configure.ac b/docs/configure.ac index cb5a6eaa4c..c2e5edd3b3 100644 --- a/docs/configure.ac +++ b/docs/configure.ac @@ -9,6 +9,9 @@ AC_CONFIG_FILES([ ../config/Docs.mk man/xl.cfg.5.pod man/xl.1.pod +man/xl-disk-configuration.5.pod +man/xl-network-configuration.5.pod +man/xl.conf.5.pod ]) AC_CONFIG_AUX_DIR([../]) diff --git a/docs/man/xl-disk-configuration.5.pod b/docs/man/xl-disk-configuration.5.pod.in index 46feedb95e..71d0e86e3d 100644 --- a/docs/man/xl-disk-configuration.5.pod +++ b/docs/man/xl-disk-configuration.5.pod.in @@ -257,7 +257,7 @@ automatically determine the most suitable backend. Specifies that B<target> is not a normal host path, but rather information to be interpreted by the executable program I<SCRIPT>, -(looked for in F</etc/xen/scripts>, if it doesn't contain a slash). +(looked for in F<@XEN_SCRIPT_DIR@>, if it doesn't contain a slash). These scripts are normally called "block-I<SCRIPT>". diff --git a/docs/man/xl-network-configuration.5.pod b/docs/man/xl-network-configuration.5.pod.in index 8e5fd909fa..cf92d7960c 100644 --- a/docs/man/xl-network-configuration.5.pod +++ b/docs/man/xl-network-configuration.5.pod.in @@ -169,8 +169,8 @@ number. Likewise the default tap name is C<vifDOMID.DEVID-emu>. Specifies the hotplug script to run to configure this device (e.g. to add it to the relevant bridge). Defaults to -C<XEN_SCRIPT_DIR/vif-bridge> but can be set to any script. Some example -scripts are installed in C<XEN_SCRIPT_DIR>. +C<@XEN_SCRIPT_DIR@/vif-bridge> but can be set to any script. Some example +scripts are installed in C<@XEN_SCRIPT_DIR@>. Note on NetBSD HVM guests will ignore the script option for tap (emulated) interfaces and always use diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in index e206039d99..618c195148 100644 --- a/docs/man/xl.1.pod.in +++ b/docs/man/xl.1.pod.in @@ -571,7 +571,7 @@ See the corresponding option of the I<create> subcommand. =item B<-N> I<netbufscript> Use <netbufscript> to setup network buffering instead of the -default script (/etc/xen/scripts/remus-netbuf-setup). +default script (@XEN_SCRIPT_DIR@/remus-netbuf-setup). =item B<-F> diff --git a/docs/man/xl.conf.5.pod b/docs/man/xl.conf.5.pod.in index dfea9d64ba..b48e99131a 100644 --- a/docs/man/xl.conf.5.pod +++ b/docs/man/xl.conf.5.pod.in @@ -107,7 +107,7 @@ 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> +Default: C<@XEN_SCRIPT_DIR@/vif-bridge> =item B<vif.default.bridge="NAME"> @@ -133,13 +133,13 @@ Default: C<None> Configures the default script used by Remus to setup network buffering. -Default: C</etc/xen/scripts/remus-netbuf-setup> +Default: C<@XEN_SCRIPT_DIR@/remus-netbuf-setup> =item B<colo.default.proxyscript="PATH"> Configures the default script used by COLO to setup colo-proxy. -Default: C</etc/xen/scripts/colo-proxy-setup> +Default: C<@XEN_SCRIPT_DIR@/colo-proxy-setup> =item B<output_format="json|sxp"> |