[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] NetBSD hotplug: handle case where vifname is not present



From: Manuel Bouyer <bouyer@xxxxxxxxxx>

Some Xen version didn't set the vifname in xenstore; just build one if
not present.

Signed-off-by: Manuel Bouyer <bouyer@xxxxxxxxxx>
---
 tools/hotplug/NetBSD/vif-bridge | 5 ++++-
 tools/hotplug/NetBSD/vif-ip     | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/hotplug/NetBSD/vif-bridge b/tools/hotplug/NetBSD/vif-bridge
index b58e922601..cd428b5936 100644
--- a/tools/hotplug/NetBSD/vif-bridge
+++ b/tools/hotplug/NetBSD/vif-bridge
@@ -23,7 +23,10 @@ case $xstatus in
        xbridge=$(xenstore-read "$xpath/bridge")
        xfid=$(xenstore-read "$xpath/frontend-id")
        xhandle=$(xenstore-read "$xpath/handle")
-       iface=$(xenstore-read "$xpath/vifname")
+       iface=$(xenstore-read "$xpath/vifname") || true
+       if [ x${iface} = "x" ] ; then
+               iface=xvif$xfid.$xhandle
+       fi
        ifconfig $iface up
        brconfig $xbridge add $iface
        xenstore-write $xpath/hotplug-status connected
diff --git a/tools/hotplug/NetBSD/vif-ip b/tools/hotplug/NetBSD/vif-ip
index 83cbfe20e2..944f50f881 100644
--- a/tools/hotplug/NetBSD/vif-ip
+++ b/tools/hotplug/NetBSD/vif-ip
@@ -24,6 +24,10 @@ case $xstatus in
        xfid=$(xenstore-read "$xpath/frontend-id")
        xhandle=$(xenstore-read "$xpath/handle")
        iface=$(xenstore-read "$xpath/vifname")
+       iface=$(xenstore-read "$xpath/vifname") || true
+       if [ x${iface} = "x" ] ; then
+               iface=xvif$xfid.$xhandle
+       fi
        ifconfig $iface $xip up
        xenstore-write $xpath/hotplug-status connected
        exit 0
-- 
2.29.2




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.