From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Pau Monne Subject: [PATCH v2 3/5] hotplug/NetBSD: check type of file to attach from params Date: Thu, 26 Jul 2012 20:54:34 +0100 Message-ID: <1343332476-33765-4-git-send-email-roger.pau@citrix.com> References: <1343332476-33765-1-git-send-email-roger.pau@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1343332476-33765-1-git-send-email-roger.pau@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Christoph Egger , Ian Jackson , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org 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" filed in order to detect if we are trying to attach a file or a block device. Changes since v1: * Check that file is either a block special file or a regular file and report error otherwise. Cc: Ian Jackson Cc: Christoph Egger Acked-by: Christoph Egger Signed-off-by: Roger Pau Monne --- tools/hotplug/NetBSD/block | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/NetBSD/block b/tools/hotplug/NetBSD/block index cf5ff3a..31d9998 100644 --- a/tools/hotplug/NetBSD/block +++ b/tools/hotplug/NetBSD/block @@ -19,8 +19,14 @@ 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" +else + error "invalid file type" +fi case $xstatus in 6) -- 1.7.7.5 (Apple Git-26)