[Pkg-libvirt-commits] [libvirt] 01/01: Specify "pygrub" by default for libxl backend guests.

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to branch master
in repository libvirt.

commit bfe835fac1cb962413263da6c0c734e44561a74e
Author: Ian Campbell <ijc at debian.org>
Date:   Fri Nov 21 16:47:33 2014 +0000

    Specify "pygrub" by default for libxl backend guests.
    
    Using an absolute path prevents libxl from providing the correct
    default.
    
    Signed-off-by: Guido Günther <agx at sigxcpu.org>
    Closes: #770485
---
 debian/patches/debian/Pygrub-path.patch | 19 +++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/debian/Pygrub-path.patch b/debian/patches/debian/Pygrub-path.patch
new file mode 100644
index 0000000..30c2489
--- /dev/null
+++ b/debian/patches/debian/Pygrub-path.patch
@@ -0,0 +1,19 @@
+From: Ian Campbell <ijc at debian.org>
+Date: Fri, 21 Nov 2014 13:45:51 +0000
+Subject: allow libxl to find default path to pygrub.
+
+The Xen debian packages relocate pygrub into
+/usr/lib/xen-X.Y/bin/pygrub, not /usr/bin/pygrub. Since libxl knows to
+DTRT with a bare "pygrub" just use that by default.
+
+--- a/src/libxl/libxl_conf.h
++++ b/src/libxl/libxl_conf.h
+@@ -53,7 +53,7 @@
+ # define LIBXL_LIB_DIR LOCALSTATEDIR "/lib/libvirt/libxl"
+ # define LIBXL_SAVE_DIR LIBXL_LIB_DIR "/save"
+ # define LIBXL_DUMP_DIR LIBXL_LIB_DIR "/dump"
+-# define LIBXL_BOOTLOADER_PATH BINDIR "/pygrub"
++# define LIBXL_BOOTLOADER_PATH "pygrub"
+ 
+ /* libxl interface for setting VCPU affinity changed in 4.5. In fact, a new
+  * parameter has been added, representative of 'VCPU soft affinity'. If one
diff --git a/debian/patches/series b/debian/patches/series
index 14dcfbe..f41db22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+debian/Pygrub-path.patch
 debian/remove-RHism.diff.patch
 debian/Don-t-enable-default-network-on-boot.patch
 debian/fix-Debian-specific-path-to-hvm-loader.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git