From 540cecf0cf066ad0386993c8e625006b259c0df8 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 13 Jun 2016 08:49:04 +0100 Subject: [PATCH] hotplug/Linux: honour XEN_LIB_DIR Use configure to generate sysconfig.xendomains file. Signed-off-by: Wei Liu Acked-by: Ian Jackson --- .gitignore | 1 + tools/configure | 3 ++- tools/configure.ac | 1 + .../init.d/{sysconfig.xendomains => sysconfig.xendomains.in} | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) rename tools/hotplug/Linux/init.d/{sysconfig.xendomains => sysconfig.xendomains.in} (98%) diff --git a/.gitignore b/.gitignore index e4afda31d4..496194f4da 100644 --- a/.gitignore +++ b/.gitignore @@ -149,6 +149,7 @@ tools/hotplug/common/hotplugpath.sh tools/hotplug/FreeBSD/rc.d/xencommons tools/hotplug/FreeBSD/rc.d/xendriverdomain tools/hotplug/Linux/init.d/sysconfig.xencommons +tools/hotplug/Linux/init.d/sysconfig.xendomains tools/hotplug/Linux/init.d/xen-watchdog tools/hotplug/Linux/init.d/xencommons tools/hotplug/Linux/init.d/xendomains diff --git a/tools/configure b/tools/configure index 7d16f67bd1..86f1a8120a 100755 --- a/tools/configure +++ b/tools/configure @@ -2409,7 +2409,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdomain hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/init.d/xendriverdomain hotplug/Linux/vif-setup hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons hotplug/NetBSD/rc.d/xendriverdomain libxl/xenlight.pc.in libxl/xlutil.pc.in ocaml/xenstored/oxenstored.conf" +ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdomain hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/sysconfig.xendomains hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/init.d/xendriverdomain hotplug/Linux/vif-setup hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons hotplug/NetBSD/rc.d/xendriverdomain libxl/xenlight.pc.in libxl/xlutil.pc.in ocaml/xenstored/oxenstored.conf" ac_config_headers="$ac_config_headers config.h" @@ -10367,6 +10367,7 @@ do "hotplug/FreeBSD/rc.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/FreeBSD/rc.d/xencommons" ;; "hotplug/FreeBSD/rc.d/xendriverdomain") CONFIG_FILES="$CONFIG_FILES hotplug/FreeBSD/rc.d/xendriverdomain" ;; "hotplug/Linux/init.d/sysconfig.xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/sysconfig.xencommons" ;; + "hotplug/Linux/init.d/sysconfig.xendomains") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/sysconfig.xendomains" ;; "hotplug/Linux/init.d/xen-watchdog") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xen-watchdog" ;; "hotplug/Linux/init.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xencommons" ;; "hotplug/Linux/init.d/xendomains") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xendomains" ;; diff --git a/tools/configure.ac b/tools/configure.ac index 2e5c95cbcf..8704927443 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -10,6 +10,7 @@ AC_CONFIG_FILES([ hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdomain hotplug/Linux/init.d/sysconfig.xencommons +hotplug/Linux/init.d/sysconfig.xendomains hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains diff --git a/tools/hotplug/Linux/init.d/sysconfig.xendomains b/tools/hotplug/Linux/init.d/sysconfig.xendomains.in similarity index 98% rename from tools/hotplug/Linux/init.d/sysconfig.xendomains rename to tools/hotplug/Linux/init.d/sysconfig.xendomains.in index 031cdb75ed..f61ef9c4d1 100644 --- a/tools/hotplug/Linux/init.d/sysconfig.xendomains +++ b/tools/hotplug/Linux/init.d/sysconfig.xendomains.in @@ -45,7 +45,7 @@ XENDOMAINS_CREATE_USLEEP=5000000 XENDOMAINS_MIGRATE="" ## Type: string -## Default: /var/lib/xen/save +## Default: @XEN_LIB_DIR@/save # # Directory to save running domains to when the system (dom0) is # shut down. Will also be used to restore domains from if # XENDOMAINS_RESTORE @@ -53,7 +53,7 @@ XENDOMAINS_MIGRATE="" # (e.g. because you rather shut domains down). # If domain saving does succeed, SHUTDOWN will not be executed. # -XENDOMAINS_SAVE=/var/lib/xen/save +XENDOMAINS_SAVE=@XEN_LIB_DIR@/save ## Type: string ## Default: "--wait" -- 2.39.5