diff --git a/vif-route-ifup.patch b/vif-route-ifup.patch index ea75bce..3124b8d 100644 --- a/vif-route-ifup.patch +++ b/vif-route-ifup.patch @@ -1,42 +1,9 @@ -Index: xen-4.1.0-testing/tools/hotplug/Linux/vif-route-ifup -=================================================================== ---- /dev/null -+++ xen-4.1.0-testing/tools/hotplug/Linux/vif-route-ifup -@@ -0,0 +1,34 @@ -+#!/bin/bash -+#============================================================================ -+# /etc/xen/vif-route-ifup -+# -+# Script for configuring a vif in routed mode. -+# The hotplugging system will call this script if it is specified either in -+# the device configuration given to Xend, or the default Xend configuration -+# in /etc/xen/xend-config.sxp. If the script is specified in neither of those -+# places, then vif-bridge is the default. -+# -+# Usage: -+# vif-route-ifup (add|remove|online|offline) -+# -+# Environment vars: -+# vif vif interface name (required). -+#============================================================================ -+ -+dir=$(dirname "$0") -+. "$dir/vif-common.sh" -+ -+case "$command" in -+ online) -+ ifup ${vif} -+ ;; -+ offline) -+ do_without_error ifdown ${vif} -+ ;; -+esac -+ -+log debug "Successful vif-route-ifup $command for $vif." -+if [ "$command" = "online" ] -+then -+ success -+fi +--- + tools/examples/xend-config.sxp | 20 ++++++++++++++++++++ + tools/hotplug/Linux/Makefile | 2 +- + tools/hotplug/Linux/vif-route-ifup | 34 ++++++++++++++++++++++++++++++++++ + 3 files changed, 55 insertions(+), 1 deletion(-) + Index: xen-4.1.0-testing/tools/examples/xend-config.sxp =================================================================== --- xen-4.1.0-testing.orig/tools/examples/xend-config.sxp @@ -81,3 +48,42 @@ Index: xen-4.1.0-testing/tools/hotplug/Linux/Makefile XEN_SCRIPTS += network-nat vif-nat XEN_SCRIPTS += vif2 XEN_SCRIPTS += vif-setup +Index: xen-4.1.0-testing/tools/hotplug/Linux/vif-route-ifup +=================================================================== +--- /dev/null ++++ xen-4.1.0-testing/tools/hotplug/Linux/vif-route-ifup +@@ -0,0 +1,34 @@ ++#!/bin/bash ++#============================================================================ ++# /etc/xen/vif-route-ifup ++# ++# Script for configuring a vif in routed mode. ++# The hotplugging system will call this script if it is specified either in ++# the device configuration given to Xend, or the default Xend configuration ++# in /etc/xen/xend-config.sxp. If the script is specified in neither of those ++# places, then vif-bridge is the default. ++# ++# Usage: ++# vif-route-ifup (add|remove|online|offline) ++# ++# Environment vars: ++# dev vif interface name (required). ++#============================================================================ ++ ++dir=$(dirname "$0") ++. "$dir/vif-common.sh" ++ ++case "$command" in ++ online) ++ ifup ${dev} ++ ;; ++ offline) ++ do_without_error ifdown ${dev} ++ ;; ++esac ++ ++log debug "Successful vif-route-ifup $command for ${dev}." ++if [ "$command" = "online" ] ++then ++ success ++fi diff --git a/xen.changes b/xen.changes index 1af670e..5850500 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 21 16:30:30 CEST 2011 - ohering@suse.de + +- bnc#685189: update vif-route-ifup.patch to use correct variable + after upstream commit 22910:d4bc41a8cecb + ------------------------------------------------------------------- Wed Apr 20 17:50:04 CEST 2011 - ohering@suse.de