From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>, Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH 06/17] hotplug/Linux: honour XEN_LIB_DIR
Date: Mon, 13 Jun 2016 08:49:04 +0100 [thread overview]
Message-ID: <1465804155-14469-7-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1465804155-14469-1-git-send-email-wei.liu2@citrix.com>
Use configure to generate sysconfig.xendomains file.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
I've committed the result of autogen.sh. Rerun autogen.sh if necessary.
---
.gitignore | 1 +
tools/configure | 3 ++-
tools/configure.ac | 1 +
.../Linux/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 e4afda3..496194f 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 7d16f67..86f1a81 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 2e5c95c..8704927 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 031cdb7..f61ef9c 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.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-13 7:49 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
2016-06-13 7:48 ` [PATCH 01/17] oxenstored: honour XEN_{LOG, RUN}_DIR in oxenstored.conf Wei Liu
2016-06-13 7:49 ` [PATCH 02/17] oxenstored: generate a paths module Wei Liu
2016-06-13 7:49 ` [PATCH 03/17] oxenstored: honour XEN_LOG_DIR defined by configure Wei Liu
2016-06-13 10:07 ` Andrew Cooper
2016-06-13 10:34 ` Wei Liu
2016-06-13 7:49 ` [PATCH 04/17] build: introduce and export XEN_LIB_DIR Wei Liu
2016-06-13 15:10 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 05/17] tools: install and remove XEN_LIB_DIR in Makefile Wei Liu
2016-06-13 15:11 ` Ian Jackson
2016-06-13 7:49 ` Wei Liu [this message]
2016-06-13 15:12 ` [PATCH 06/17] hotplug/Linux: honour XEN_LIB_DIR Ian Jackson
2016-06-13 7:49 ` [PATCH 07/17] libxl: " Wei Liu
2016-06-13 15:12 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile Wei Liu
2016-06-13 15:13 ` Ian Jackson
2016-06-13 15:29 ` Wei Liu
2016-06-13 16:07 ` Ian Jackson
2016-06-13 16:33 ` Wei Liu
2016-06-13 16:57 ` Ian Jackson
2016-06-13 18:16 ` Wei Liu
2016-06-14 9:56 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 09/17] docs: honour XEN_DUMP_DIR Wei Liu
2016-06-13 15:15 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 10/17] build: introduce XEN_RUN_STORED Wei Liu
2016-06-14 17:00 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 11/17] hotplug/Linux: honour XEN_RUN_STORED Wei Liu
2016-06-13 15:19 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 12/17] libxenstore: " Wei Liu
2016-06-13 15:19 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 13/17] hotplug/FreeBSD: " Wei Liu
2016-06-13 9:32 ` Roger Pau Monné
2016-06-13 15:20 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 14/17] ocaml/libxs: generate a paths.ml Wei Liu
2016-06-13 15:19 ` Ian Jackson
2016-06-13 15:22 ` Wei Liu
2016-06-13 19:50 ` David Scott
2016-06-14 9:36 ` Wei Liu
2016-06-14 20:08 ` David Scott
2016-06-15 9:07 ` Wei Liu
2016-06-13 7:49 ` [PATCH 15/17] ocaml/libxs: honour XEN_RUN_STORED Wei Liu
2016-06-14 20:06 ` David Scott
2016-06-13 7:49 ` [PATCH 16/17] oxenstored: honour XEN_RUN_STORED and XEN_CONFIG_DIR Wei Liu
2016-06-14 20:07 ` David Scott
2016-06-13 7:49 ` [PATCH 17/17] oxenstored: honour XEN_RUN_STORED in systemd C stub Wei Liu
2016-06-14 20:07 ` David Scott
2016-06-14 13:17 ` [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
2016-06-17 10:43 ` Wei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465804155-14469-7-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).