From mboxrd@z Thu Jan  1 00:00:00 1970
From: Richie <listmail@triad.rr.com>
Subject: [PATCH] xend: update init script to avoid grep on
 non-existent file system
Date: Sat, 15 May 2010 00:16:08 -0400
Message-ID: <4BEE2008.7020808@triad.rr.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------080809060201080209050807"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Xen Devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

This is a multi-part message in MIME format.
--------------080809060201080209050807
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

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.

--------------080809060201080209050807
Content-Type: text/x-patch;
 name="xend.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="xend.patch"

# HG changeset patch
# User Richie <listmail@triad.rr.com>
# 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
 

--------------080809060201080209050807
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

--------------080809060201080209050807--