Author: waldi
Date: Tue Jan 31 13:45:53 2012
New Revision: 956
Log:
debian/patches: Import patches from xen-common.
Added:
trunk/xen/debian/patches/tools-examples-xend-disable-network.diff
- copied unchanged from r937,
trunk/xen-common/debian/patches/xend-disable-network
trunk/xen/debian/patches/tools-examples-xend-disable-relocation.diff
- copied unchanged from r937,
trunk/xen-common/debian/patches/xend-disable-relocation
trunk/xen/debian/patches/tools-hotplug-install.diff
- copied unchanged from r937, trunk/xen-common/debian/patches/scripts
Modified:
trunk/xen/debian/patches/series
Modified: trunk/xen/debian/patches/series
=============================================================================---
trunk/xen/debian/patches/series Tue Jan 31 13:09:30 2012 (r955)
+++ trunk/xen/debian/patches/series Tue Jan 31 13:45:53 2012 (r956)
@@ -46,11 +46,14 @@
tools-libxl-nopidfile.diff
tools-disable.diff
+tools-examples-xend-disable-network.diff
+tools-examples-xend-disable-relocation.diff
tools-firmware-etherboot-packaged.diff
qemu-disable.diff
tools-pygrub-remove-static-solaris-support.patch
+tools-hotplug-install.diff
tools-include-install.diff
tools-xenmon-install.diff
Copied: trunk/xen/debian/patches/tools-examples-xend-disable-network.diff (from
r937, trunk/xen-common/debian/patches/xend-disable-network)
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen/debian/patches/tools-examples-xend-disable-network.diff Tue Jan 31
13:45:53 2012 (r956, copy of r937,
trunk/xen-common/debian/patches/xend-disable-network)
@@ -0,0 +1,22 @@
+--- a/tools/examples/xend-config.sxp
++++ b/tools/examples/xend-config.sxp
+@@ -130,6 +130,11 @@
+ #(console-limit 1024)
+
+ ##
++# NOTE:
++# Please read /usr/share/doc/xen-utils-common/README.Debian for Debian
specific
++# informations about the network setup.
++
++##
+ # To bridge network traffic, like this:
+ #
+ # dom0: ----------------- bridge -> real eth0 -> the network
+@@ -154,7 +159,6 @@
+ # two fake interfaces per guest domain. To do things like this, write
+ # yourself a wrapper script, and call network-bridge from it, as appropriate.
+ #
+-(network-script network-bridge)
+
+ # The script used to control virtual interfaces. This can be overridden on a
+ # per-vif basis when creating a domain or a configuring a new vif. The
Copied: trunk/xen/debian/patches/tools-examples-xend-disable-relocation.diff
(from r937, trunk/xen-common/debian/patches/xend-disable-relocation)
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen/debian/patches/tools-examples-xend-disable-relocation.diff Tue Jan
31 13:45:53 2012 (r956, copy of r937,
trunk/xen-common/debian/patches/xend-disable-relocation)
@@ -0,0 +1,18 @@
+--- a/tools/examples/xend-config.sxp
++++ b/tools/examples/xend-config.sxp
+@@ -62,7 +62,6 @@
+ #(xend-tcp-xmlrpc-server no)
+ #(xend-unix-xmlrpc-server yes)
+ #(xend-relocation-server no)
+-(xend-relocation-server yes)
+ #(xend-relocation-ssl-server no)
+ #(xend-udev-event-server no)
+
+@@ -124,7 +123,6 @@
+ # (xend-relocation-hosts-allow ''^localhost$
^.*\\.example\\.org$'')
+ #
+ #(xend-relocation-hosts-allow '''')
+-(xend-relocation-hosts-allow ''^localhost$
^localhost\\.localdomain$'')
+
+ # The limit (in kilobytes) on the size of the console buffer
+ #(console-limit 1024)
Copied: trunk/xen/debian/patches/tools-hotplug-install.diff (from r937,
trunk/xen-common/debian/patches/scripts)
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen/debian/patches/tools-hotplug-install.diff Tue Jan 31 13:45:53 2012
(r956, copy of r937, trunk/xen-common/debian/patches/scripts)
@@ -0,0 +1,20 @@
+--- a/tools/hotplug/common/Makefile
++++ b/tools/hotplug/common/Makefile
+@@ -6,8 +6,8 @@
+ # OS-independent hotplug scripts go in this directory
+
+ # Xen scripts to go there.
+-XEN_SCRIPTS = $(HOTPLUGPATH)
+-XEN_SCRIPT_DATA ++XEN_SCRIPTS ++XEN_SCRIPT_DATA = $(HOTPLUGPATH)
+
+ genpath-target = $(call buildmakevars2file,$(HOTPLUGPATH))
+ $(eval $(genpath-target))
+--- a/tools/hotplug/Linux/vtpm-impl
++++ b/tools/hotplug/Linux/vtpm-impl
+@@ -1,4 +1,3 @@
+-#!/bin/bash
+ # ==================================================================+ #
+ # Copyright (c) 2005, Intel Corp.