Date: Fri, 15 Nov 2013 14:59:57 +0100
From: Natanael Copa <ncopa@alpinelinux.org>
To: Eivind Uggedal <eivind@uggedal.com>
Cc: alpine-devel@lists.alpinelinux.org
Subject: Re: [alpine-devel] [PATCH] Let is_xen_dom0 fail silently
Message-ID: <20131115145957.05c2d1d8@ncopa-desktop.alpinelinux.org>
In-Reply-To: <1384517959-21682-1-git-send-email-eivind@uggedal.com>
References: <1384517959-21682-1-git-send-email-eivind@uggedal.com>
Precedence: list
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Fri, 15 Nov 2013 13:19:19 +0100
Eivind Uggedal <eivind@uggedal.com> wrote:

> /proc/xen/capabilities can be non-existent while /proc/xen
> exists.
> 
> This behaviour was seen when booting in rescue mode on
> Linode.
> ---
>  libalpine.sh.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libalpine.sh.in b/libalpine.sh.in
> index a03deb3c6b91..7aec8155d1be 100644
> --- a/libalpine.sh.in
> +++ b/libalpine.sh.in
> @@ -89,7 +89,7 @@ is_xen() {
>  # Detect if we are running Xen Dom0
>  is_xen_dom0() {
>  	is_xen && \
> -	grep -q "control_d" /proc/xen/capabilities
> +	grep -q "control_d" /proc/xen/capabilities 2>/dev/null
>  }
>  
>  # list of available network interfaces that aren't part of any bridge or bond

applied. thanks!

-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---