X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 8F1E7DC0244 for ; Fri, 15 Nov 2013 12:19:38 +0000 (UTC) Received: by mail-wi0-f174.google.com with SMTP id hi5so892727wib.13 for ; Fri, 15 Nov 2013 04:19:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=2HTfG6GlhEUW296+Xd39n7SjEF92pb27ASsaKhL+Pks=; b=S+ySiRdZjatZZqXGweCfnYiyHr+Ral5gMYLXESrD3Nw4Y2AAYX6unrSnGWky6KVfte 9co/fC1uUSatvpMgkbYMO5OafWym6SQynMX37vsKYUknp8FIlBCf3mC+T/E6+zbLf/bd U/OlzC2COdsJ5jCqu65FVH3J/ifbfZTtheA1efvyFgss5iflwQp8TjxVwnXBG+PEpsuY 35rj+ZOYb6Kq2pTwRwM+xUsCo9phqjZb9Nqda7q3yULrPMSdvPrCNGWj83TMjSoEM04t uCOm7KlU5zoURIDrHVQAOVjFmoR8DgZxddwSyPmg4goB0sqNU7gDQ4WQru9Xb+4eFxJh SetQ== X-Gm-Message-State: ALoCoQnFk+PdbmE41ZwMYhU9KXfte4w+BsejysB2kcjG3IYhkIbJZswNozR/IS1zFWjGuyoqPwYv X-Received: by 10.180.91.129 with SMTP id ce1mr7135233wib.27.1384517976433; Fri, 15 Nov 2013 04:19:36 -0800 (PST) Received: from phosphorus.uggedal.com.com (li300-233.members.linode.com. [178.79.162.233]) by mx.google.com with ESMTPSA id qc10sm4498090wic.9.2013.11.15.04.19.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Nov 2013 04:19:35 -0800 (PST) From: Eivind Uggedal To: alpine-devel@lists.alpinelinux.org Subject: [alpine-devel] [PATCH] Let is_xen_dom0 fail silently Date: Fri, 15 Nov 2013 13:19:19 +0100 Message-Id: <1384517959-21682-1-git-send-email-eivind@uggedal.com> X-Mailer: git-send-email 1.8.4.1 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: /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 -- 1.8.4.1 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---