Xen project Mailing List

[xen master] tools: add with-xen-scriptdir configure option

Date: Sun, 14 Feb 2021 01:36:55 +0000

Delivery-date: Sun, 14 Feb 2021 01:36:56 +0000

List-id: "Change log for Mercurial $receive only$" <xen-changelog.lists.xenproject.org>

commit 7a321c3676250aac5bacb1ae8d7dd22bfe8b1448 Author: Olaf Hering <olaf@xxxxxxxxx> AuthorDate: Tue Feb 9 16:45:34 2021 +0100 Commit: Ian Jackson <iwj@xxxxxxxxxxxxxx> CommitDate: Tue Feb 9 17:10:03 2021 +0000 tools: add with-xen-scriptdir configure option Some distros plan for fresh installations will have an empty /etc, whose content will not be controlled by the package manager anymore. To make this possible, add a knob to configure to allow storing the hotplug scripts to libexec instead of /etc/xen/scripts. The current default remains unchanged, which is /etc/xen/scripts. [autoconf rerun -iwj] Signed-off-by: Olaf Hering <olaf@xxxxxxxxx> Release-Acked-by: Ian Jackson <iwj@xxxxxxxxxxxxxx> Reviewed-by: Ian Jackson <iwj@xxxxxxxxxxxxxx> --- configure | 20 ++++++++++++++++---- docs/configure | 20 ++++++++++++++++---- m4/paths.m4 | 11 ++++++++--- tools/configure | 20 ++++++++++++++++---- 4 files changed, 56 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 2fe26c1bf7..a2789ae480 100755 --- a/configure +++ b/configure @@ -599,7 +599,6 @@ DEBUG_DIR XEN_DUMP_DIR XEN_PAGING_DIR XEN_LOCK_DIR -XEN_SCRIPT_DIR INITD_DIR SHAREDIR XEN_LIB_DIR @@ -612,6 +611,7 @@ LIBEXEC_INC LIBEXEC_LIB LIBEXEC_BIN LIBEXEC +XEN_SCRIPT_DIR CONFIG_LEAF_DIR XEN_CONFIG_DIR CONFIG_DIR @@ -670,6 +670,7 @@ enable_option_checking with_initddir with_sysconfig_leaf_dir with_libexec_leaf_dir +with_xen_scriptdir with_xen_dumpdir with_rundir with_debugdir @@ -1328,6 +1329,9 @@ Optional Packages: "default". [sysconfig] --with-libexec-leaf-dir=SUBDIR Name of subdirectory in libexecdir to use. + --with-xen-scriptdir=DIR + Path to directory for dom0 hotplug scripts. + [SYSCONFDIR/xen/scripts] --with-xen-dumpdir=DIR Path to directory for domU crash dumps. [LOCALSTATEDIR/lib/xen/dump] --with-rundir=DIR Path to directory for runtime data. @@ -1984,6 +1988,17 @@ fi +# Check whether --with-xen-scriptdir was given. +if test "${with_xen_scriptdir+set}" = set; then : + withval=$with_xen_scriptdir; xen_scriptdir_path=$withval +else + xen_scriptdir_path=$XEN_CONFIG_DIR/scripts +fi + +XEN_SCRIPT_DIR=$xen_scriptdir_path + + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : withval=$with_xen_dumpdir; xen_dumpdir_path=$withval @@ -2051,9 +2066,6 @@ SHAREDIR=$prefix/share INITD_DIR=$initddir_path -XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts - - case "$host_os" in *freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;; *netbsd*) XEN_LOCK_DIR=$rundir_path ;; diff --git a/docs/configure b/docs/configure index 18075e4e00..e9c040cb84 100755 --- a/docs/configure +++ b/docs/configure @@ -597,7 +597,6 @@ DEBUG_DIR XEN_DUMP_DIR XEN_PAGING_DIR XEN_LOCK_DIR -XEN_SCRIPT_DIR INITD_DIR SHAREDIR XEN_LIB_DIR @@ -610,6 +609,7 @@ LIBEXEC_INC LIBEXEC_LIB LIBEXEC_BIN LIBEXEC +XEN_SCRIPT_DIR CONFIG_LEAF_DIR XEN_CONFIG_DIR CONFIG_DIR @@ -660,6 +660,7 @@ enable_option_checking with_initddir with_sysconfig_leaf_dir with_libexec_leaf_dir +with_xen_scriptdir with_xen_dumpdir with_rundir with_debugdir @@ -1301,6 +1302,9 @@ Optional Packages: "default". [sysconfig] --with-libexec-leaf-dir=SUBDIR Name of subdirectory in libexecdir to use. + --with-xen-scriptdir=DIR + Path to directory for dom0 hotplug scripts. + [SYSCONFDIR/xen/scripts] --with-xen-dumpdir=DIR Path to directory for domU crash dumps. [LOCALSTATEDIR/lib/xen/dump] --with-rundir=DIR Path to directory for runtime data. @@ -1887,6 +1891,17 @@ fi +# Check whether --with-xen-scriptdir was given. +if test "${with_xen_scriptdir+set}" = set; then : + withval=$with_xen_scriptdir; xen_scriptdir_path=$withval +else + xen_scriptdir_path=$XEN_CONFIG_DIR/scripts +fi + +XEN_SCRIPT_DIR=$xen_scriptdir_path + + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : withval=$with_xen_dumpdir; xen_dumpdir_path=$withval @@ -1954,9 +1969,6 @@ SHAREDIR=$prefix/share INITD_DIR=$initddir_path -XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts - - case "$host_os" in *freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;; *netbsd*) XEN_LOCK_DIR=$rundir_path ;; diff --git a/m4/paths.m4 b/m4/paths.m4 index a736f57d8d..7be314a3e2 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -76,6 +76,14 @@ AC_ARG_WITH([libexec-leaf-dir], [libexec_subdir=$withval], [libexec_subdir=$PACKAGE_TARNAME]) +AC_ARG_WITH([xen-scriptdir], + AS_HELP_STRING([--with-xen-scriptdir=DIR], + [Path to directory for dom0 hotplug scripts. [SYSCONFDIR/xen/scripts]]), + [xen_scriptdir_path=$withval], + [xen_scriptdir_path=$XEN_CONFIG_DIR/scripts]) +XEN_SCRIPT_DIR=$xen_scriptdir_path +AC_SUBST(XEN_SCRIPT_DIR) + AC_ARG_WITH([xen-dumpdir], AS_HELP_STRING([--with-xen-dumpdir=DIR], [Path to directory for domU crash dumps. [LOCALSTATEDIR/lib/xen/dump]]), @@ -137,9 +145,6 @@ AC_SUBST(SHAREDIR) INITD_DIR=$initddir_path AC_SUBST(INITD_DIR) -XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts -AC_SUBST(XEN_SCRIPT_DIR) - case "$host_os" in *freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;; *netbsd*) XEN_LOCK_DIR=$rundir_path ;; diff --git a/tools/configure b/tools/configure index 86de2e2736..419d7b189a 100755 --- a/tools/configure +++ b/tools/configure @@ -720,7 +720,6 @@ DEBUG_DIR XEN_DUMP_DIR XEN_PAGING_DIR XEN_LOCK_DIR -XEN_SCRIPT_DIR INITD_DIR SHAREDIR XEN_LIB_DIR @@ -733,6 +732,7 @@ LIBEXEC_INC LIBEXEC_LIB LIBEXEC_BIN LIBEXEC +XEN_SCRIPT_DIR CONFIG_LEAF_DIR XEN_CONFIG_DIR CONFIG_DIR @@ -801,6 +801,7 @@ enable_largefile with_initddir with_sysconfig_leaf_dir with_libexec_leaf_dir +with_xen_scriptdir with_xen_dumpdir with_rundir with_debugdir @@ -1526,6 +1527,9 @@ Optional Packages: "default". [sysconfig] --with-libexec-leaf-dir=SUBDIR Name of subdirectory in libexecdir to use. + --with-xen-scriptdir=DIR + Path to directory for dom0 hotplug scripts. + [SYSCONFDIR/xen/scripts] --with-xen-dumpdir=DIR Path to directory for domU crash dumps. [LOCALSTATEDIR/lib/xen/dump] --with-rundir=DIR Path to directory for runtime data. @@ -3966,6 +3970,17 @@ fi +# Check whether --with-xen-scriptdir was given. +if test "${with_xen_scriptdir+set}" = set; then : + withval=$with_xen_scriptdir; xen_scriptdir_path=$withval +else + xen_scriptdir_path=$XEN_CONFIG_DIR/scripts +fi + +XEN_SCRIPT_DIR=$xen_scriptdir_path + + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : withval=$with_xen_dumpdir; xen_dumpdir_path=$withval @@ -4033,9 +4048,6 @@ SHAREDIR=$prefix/share INITD_DIR=$initddir_path -XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts - - case "$host_os" in *freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;; *netbsd*) XEN_LOCK_DIR=$rundir_path ;; -- generated by git-patchbot for /home/xen/git/xen.git#master

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.