WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH] xend: update init script to avoid grep on non-existe

To: Xen Devel <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] [PATCH] xend: update init script to avoid grep on non-existent file system
From: Richie <listmail@xxxxxxxxxxxx>
Date: Sat, 15 May 2010 00:16:08 -0400
Delivery-date: Fri, 14 May 2010 21:17:13 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Thunderbird 2.0.0.23 (X11/20090817)
I'm seeing a grep error during bare metal pvops kernel boot. In the init script, the previous checks will avoid/perform the /proc/xen mount as appropriate, but then it does a grep on /proc/xen/capabilities without ensuring that /proc/xen is actually mounted. This is my attempt (read: first patch :) ) to avoid it.
# HG changeset patch
# User Richie <listmail@xxxxxxxxxxxx>
# Date 1273894781 14400
# Node ID 90705b2abd84e75971d12dead966191731ab1361
# Parent  baccadfd9418b8dee931945e5752cb118f5bf3cb
xend: update init script to avoid grep on non-existent file system

diff -r baccadfd9418 -r 90705b2abd84 tools/hotplug/Linux/init.d/xend
--- a/tools/hotplug/Linux/init.d/xend   Fri May 14 08:05:05 2010 +0100
+++ b/tools/hotplug/Linux/init.d/xend   Fri May 14 23:39:41 2010 -0400
@@ -31,7 +31,8 @@
        mount -t xenfs xenfs /proc/xen
 fi
 
-if ! grep -q "control_d" /proc/xen/capabilities ; then
+if ! test -d /proc/xen || \
+   ! grep -q "control_d" /proc/xen/capabilities ; then
        exit 0
 fi
 
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel