[Pkg-xen-changes] [xen] 05/07: merge patched-develop into develop
Bastian Blank
waldi at moszumanska.debian.org
Sat Sep 6 14:36:48 UTC 2014
This is an automated email from the git hooks/post-receive script.
waldi pushed a commit to branch develop
in repository xen.
commit 3fc3fe6eabbb5ddcf9118e4d3e5177dab0617e6e
Merge: 2897c25 071ee64
Author: Bastian Blank <waldi at debian.org>
Date: Sat Sep 6 15:44:27 2014 +0200
merge patched-develop into develop
debian/.git-dpm | 4 +-
...1-send-xl-coredumps-var-lib-xen-dump-NAME.patch | 79 ++++++++++++++++++++++
debian/patches/series | 1 +
docs/man/xl.cfg.pod.5 | 4 +-
tools/Makefile | 2 +-
tools/libxl/xl_cmdimpl.c | 2 +-
tools/python/xen/xend/XendDomainInfo.py | 4 +-
7 files changed, 88 insertions(+), 8 deletions(-)
diff --cc debian/.git-dpm
index 0c1e11f,0000000..c535fd1
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 93bead88e51dce30e9c5ffb8e899f4f0f6897c64
- 93bead88e51dce30e9c5ffb8e899f4f0f6897c64
++071ee641afc48f40b8052c77c5eb1e4086297654
++071ee641afc48f40b8052c77c5eb1e4086297654
+960b45d65509eb156ccdac8f50a31ffa28e963a1
+960b45d65509eb156ccdac8f50a31ffa28e963a1
+xen_4.4.0.orig.tar.xz
+39aaa0627cd93920be8d12e4c63042c23d653c8c
+3767352
diff --cc debian/patches/0041-send-xl-coredumps-var-lib-xen-dump-NAME.patch
index 0000000,0000000..dbe7d3c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0041-send-xl-coredumps-var-lib-xen-dump-NAME.patch
@@@ -1,0 -1,0 +1,79 @@@
++From 071ee641afc48f40b8052c77c5eb1e4086297654 Mon Sep 17 00:00:00 2001
++From: Ian Campbell <ijc at hellion.org.uk>
++Date: Sun, 31 Aug 2014 01:42:03 +0100
++Subject: send xl coredumps /var/lib/xen/dump/NAME
++
++---
++ docs/man/xl.cfg.pod.5 | 4 ++--
++ tools/Makefile | 2 +-
++ tools/libxl/xl_cmdimpl.c | 2 +-
++ tools/python/xen/xend/XendDomainInfo.py | 4 ++--
++ 4 files changed, 6 insertions(+), 6 deletions(-)
++
++diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
++index e15a49f..d26ea0b 100644
++--- a/docs/man/xl.cfg.pod.5
+++++ b/docs/man/xl.cfg.pod.5
++@@ -268,12 +268,12 @@ destroy`.
++
++ =item B<coredump-destroy>
++
++-write a "coredump" of the domain to F</var/xen/dump/NAME> and then
+++write a "coredump" of the domain to F</var/lib/xen/dump/NAME> and then
++ destroy the domain.
++
++ =item B<coredump-restart>
++
++-write a "coredump" of the domain to F</var/xen/dump/NAME> and then
+++write a "coredump" of the domain to F</var/lib/xen/dump/NAME> and then
++ restart the domain.
++
++ =back
++diff --git a/tools/Makefile b/tools/Makefile
++index 2fca717..7c2dcaf 100644
++--- a/tools/Makefile
+++++ b/tools/Makefile
++@@ -58,7 +58,7 @@ all: subdirs-all
++
++ .PHONY: install
++ install: subdirs-install
++- $(INSTALL_DIR) $(DESTDIR)/var/xen/dump
+++ $(INSTALL_DIR) $(DESTDIR)/var/lib/xen/dump/
++ $(INSTALL_DIR) $(DESTDIR)/var/log/xen
++ $(INSTALL_DIR) $(DESTDIR)/var/lib/xen
++ $(INSTALL_DIR) $(DESTDIR)/var/lock/subsys
++diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
++index 4fc46eb..4e9dacb 100644
++--- a/tools/libxl/xl_cmdimpl.c
+++++ b/tools/libxl/xl_cmdimpl.c
++@@ -1815,7 +1815,7 @@ static int handle_domain_death(uint32_t *r_domid,
++ char *corefile;
++ int rc;
++
++- if (asprintf(&corefile, "/var/xen/dump/%s", d_config->c_info.name) < 0) {
+++ if (asprintf(&corefile, "/var/lib/xen/dump/%s", d_config->c_info.name) < 0) {
++ LOG("failed to construct core dump path");
++ } else {
++ LOG("dumping core to %s", corefile);
++diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
++index cb2d36d..793f3b2 100644
++--- a/tools/python/xen/xend/XendDomainInfo.py
+++++ b/tools/python/xen/xend/XendDomainInfo.py
++@@ -2288,7 +2288,7 @@ class XendDomainInfo:
++ # To prohibit directory traversal
++ based_name = os.path.basename(self.info['name_label'])
++
++- coredir = "/var/xen/dump/%s" % (based_name)
+++ coredir = "/var/lib/xen/dump/%s" % (based_name)
++ if not os.path.exists(coredir):
++ try:
++ mkdir.parents(coredir, stat.S_IRWXU)
++@@ -2297,7 +2297,7 @@ class XendDomainInfo:
++
++ if not os.path.isdir(coredir):
++ # Use former directory to dump core
++- coredir = '/var/xen/dump'
+++ coredir = '/var/lib/xen/dump/'
++
++ this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime())
++ corefile = "%s/%s-%s.%s.core" % (coredir, this_time,
diff --cc debian/patches/series
index 2fbad3a,0000000..706b44c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,40 -1,0 +1,41 @@@
+0001-version.patch
+0002-config-prefix.diff.patch
+0003-tools-libfsimage-abiname.diff.patch
+0004-tools-libxc-abiname.diff.patch
+0005-tools-libxl-abiname.diff.patch
+0006-tools-xenstat-abiname.diff.patch
+0007-tools-rpath.diff.patch
+0008-tools-blktap2-prefix.diff.patch
+0009-tools-console-prefix.diff.patch
+0010-tools-libfsimage-prefix.diff.patch
+0011-tools-libfsimage-rpath.diff.patch
+0012-tools-libxl-prefix.diff.patch
+0013-tools-misc-prefix.diff.patch
+0014-tools-misc-rpath.diff.patch
+0015-tools-pygrub-prefix.diff.patch
+0016-tools-python-prefix.diff.patch
+0017-tools-python-rpath.diff.patch
+0018-tools-xcutils-rpath.diff.patch
+0019-tools-xenmon-prefix.diff.patch
+0020-tools-xenmon-rpath.diff.patch
+0021-tools-xenpaging-prefix.diff.patch
+0022-tools-xenstat-prefix.diff.patch
+0023-tools-xenstat-rpath.diff.patch
+0024-tools-xenstore-prefix.diff.patch
+0025-tools-xenstore-rpath.diff.patch
+0026-tools-xentrace-prefix.diff.patch
+0027-tools-xentrace-rpath.diff.patch
+0028-tools-python-xen-relative-path.diff.patch
+0029-tools-misc-xend-startup.diff.patch
+0030-tools-disable.diff.patch
+0031-tools-examples-xend-disable-network.diff.patch
+0032-tools-examples-xend-disable-relocation.diff.patch
+0033-tools-pygrub-remove-static-solaris-support.patch
+0034-tools-include-install.diff.patch
+0035-tools-xenmon-install.diff.patch
+0036-tools-hotplug-udevrules.diff.patch
+0037-tools-python-shebang.diff.patch
+0038-tools-ocaml-fix-build.diff.patch
+0039-tools-xenstore-compatibility.diff.patch
+0040-Set-library-path-to-multi-arch-location.patch
++0041-send-xl-coredumps-var-lib-xen-dump-NAME.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git
More information about the Pkg-xen-changes
mailing list