[Pkg-xen-changes] r779 - in trunk/xen-common/debian: . patches

[Bastian Blank]

Author: waldi
Date: Mon Jun 21 13:54:53 2010
New Revision: 779

Log:
* debian/changelog: Update.
* debian/patches/xend-disable-network: Add note.

Modified:
   trunk/xen-common/debian/changelog
   trunk/xen-common/debian/patches/xend-disable-network

Modified: trunk/xen-common/debian/changelog
==============================================================================
--- trunk/xen-common/debian/changelog	Mon Jun 21 13:50:31 2010	(r778)
+++ trunk/xen-common/debian/changelog	Mon Jun 21 13:54:53 2010	(r779)
@@ -2,6 +2,7 @@
 
   * New upstream version.
   * Move README from versioned packages.
+  * Add note about own README to xend config.
 
  -- Bastian Blank <waldi at debian.org>  Mon, 21 Jun 2010 15:46:15 +0200
 

Modified: trunk/xen-common/debian/patches/xend-disable-network
==============================================================================
--- trunk/xen-common/debian/patches/xend-disable-network	Mon Jun 21 13:50:31 2010	(r778)
+++ trunk/xen-common/debian/patches/xend-disable-network	Mon Jun 21 13:54:53 2010	(r779)
@@ -1,11 +1,22 @@
 --- a/tools/examples/xend-config.sxp
 +++ b/tools/examples/xend-config.sxp
-@@ -154,7 +154,7 @@
+@@ -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)
-+#(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