NetBSD hotplug: fix block unconfigure on destroy

When a domain is destroyed, xparams may not be available any more when
the block script is called to unconfigure the vnd.
Check xparam only at configure time, and just unconfigure any vnd present
in the xenstore.

Signed-off-by: Manuel Bouyer <bouyer@netbsd.org>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>

diff --git a/tools/hotplug/NetBSD/block b/tools/hotplug/NetBSD/block
index 0acaab10ec44c7abeebd22d99c555f9da98ae0b8..eb5e80d6407aa36c9c9a81fe3f4824a8d7ab3d41 100644 (file)
--- a/tools/hotplug/NetBSD/block
+++ b/tools/hotplug/NetBSD/block
@@ -21,37 +21,28 @@ error() {
 xpath=$1
 xstatus=$2
 xparams=$(xenstore-read "$xpath/params")
-if [ -b "$xparams" ]; then
-       xtype="phy"
-elif [ -f "$xparams" ]; then
-       xtype="file"
-elif [ -z "$xparams" ]; then
-       error "$xpath/params is empty, unable to attach block device."
-else
-       error "$xparams is not a valid file type to use as block device." \
-             "Only block and regular image files accepted."
-fi
 
 case $xstatus in
 6)
        # device removed
-       case $xtype in
-       file)
-               vnd=$(xenstore-read "$xpath/vnd" || echo none)
-               if [ $vnd != none ]; then
-                       vnconfig -u $vnd
-               fi
-               ;;
-       phy)
-               ;;
-       *)
-               echo "unknown type $xtype" >&2
-               ;;
-       esac
+       vnd=$(xenstore-read "$xpath/vnd" || echo none)
+       if [ $vnd != none ]; then
+               vnconfig -u $vnd
+       fi
        xenstore-rm $xpath
        exit 0
        ;;
 2)
+       if [ -b "$xparams" ]; then
+               xtype="phy"
+       elif [ -f "$xparams" ]; then
+               xtype="file"
+       elif [ -z "$xparams" ]; then
+               error "$xpath/params is empty, unable to attach block device."
+       else
+               error "$xparams is not a valid file type to use as block device." \
+                     "Only block and regular image files accepted."
+       fi
        case $xtype in
        file)
                # Store the list of available vnd(4) devices in