From c6c1fd29e93566c2ddf6e2e0c040444b82918d28 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Fri, 31 Aug 2012 10:42:07 +0100 Subject: [PATCH] hotplug/NetBSD: check type of file to attach from params xend used to set the xenbus backend entry "type" to either "phy" or "file", but now libxl sets it to "phy" for both file and block device. We have to manually check for the type of the "param" field in order to detect if we are trying to attach a file or a block device. Signed-off-by: Christoph Egger Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- tools/hotplug/NetBSD/block | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/hotplug/NetBSD/block b/tools/hotplug/NetBSD/block index 2c10ed70ab..f1146b51c1 100644 --- a/tools/hotplug/NetBSD/block +++ b/tools/hotplug/NetBSD/block @@ -20,8 +20,17 @@ error() { xpath=$1 xstatus=$2 -xtype=$(xenstore-read "$xpath/type") 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) -- 2.30.2