From mboxrd@z Thu Jan  1 00:00:00 1970
From: Patrick Scharrenberg <pittipatti@web.de>
Subject: [PATCH] fix: domains do not get created when using
	vifname variable for bridged interfaces
Date: Sat, 5 Feb 2011 17:26:30 +0100
Message-ID: <201102051726.30996.pittipatti@web.de>
Mime-Version: 1.0
Content-Type: Text/Plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

In the two scripts vif-bridge and vif-route the variable containing the right 
interface-name, after an interface was renamed using "ifname", is $vif.
Otherwise hotplug can't handle renamed interfaces and prevents xm from 
creating domains.

Signed-off-by: Patrick Scharrenberg <pittipatti@web.de>

---

Please apply to unstable.

In 4.0.x the scripts are correct.
In unstable only vif-route contains the right variables


diff -r e7b31cc0093c tools/hotplug/Linux/vif-bridge
--- a/tools/hotplug/Linux/vif-bridge    Mon Jan 31 17:46:55 2011 +0000
+++ b/tools/hotplug/Linux/vif-bridge    Sat Feb 05 14:11:52 2011 +0100
@@ -81,18 +81,18 @@
 
 case "$command" in
     online)
-        setup_virtual_bridge_port "$dev"
-        add_to_bridge "$bridge" "$dev"
+        setup_virtual_bridge_port "$vif"
+        add_to_bridge "$bridge" "$vif"
         ;;
 
     offline)
-        do_without_error brctl delif "$bridge" "$dev"
-        do_without_error ifconfig "$dev" down
+        do_without_error brctl delif "$bridge" "$vif"
+        do_without_error ifconfig "$vif" down
         ;;
 
     add)
-        setup_virtual_bridge_port "$dev"
-        add_to_bridge "$bridge" "$dev"
+        setup_virtual_bridge_port "$vif"
+        add_to_bridge "$bridge" "$vif"
         ;;
 esac
 
@@ -100,7 +100,7 @@
     handle_iptable
 fi
 
-log debug "Successful vif-bridge $command for $dev, bridge $bridge."
+log debug "Successful vif-bridge $command for $vif, bridge $bridge."
 if [ "$type_if" = vif -a "$command" = "online" ]
 then
   success