Commit 00ee7c58 authored by Natanael Copa's avatar Natanael Copa

main/alpine-conf: let dom0 detection fail silently

parent e508f2f6
From 853ea856c7e7ecf2b350a862a62c167e7fadd7e5 Mon Sep 17 00:00:00 2001
From: Eivind Uggedal <eivind@uggedal.com>
Date: Fri, 15 Nov 2013 13:19:19 +0100
Subject: [PATCH] Let is_xen_dom0 fail silently
/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 a03deb3..7aec815 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.3
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=2.14.0
pkgrel=3
pkgrel=4
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
arch="all"
......@@ -10,6 +10,7 @@ depends="openrc"
source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
0001-setup-bootable-use-UUID-on-new-USBs.patch
0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch
0001-Let-is_xen_dom0-fail-silently.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
......@@ -38,10 +39,13 @@ package() {
md5sums="94b82dd9d7a2c63aa6909238da3b44b3 alpine-conf-2.14.0.tar.xz
c0eeeebfb67b757c954a2f5100461a7b 0001-setup-bootable-use-UUID-on-new-USBs.patch
6568923677063d92939f85157baf0dc4 0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch"
6568923677063d92939f85157baf0dc4 0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch
63e4503fc9a3ebbe79774be89ba4ded8 0001-Let-is_xen_dom0-fail-silently.patch"
sha256sums="14dc81845b16ffcbb39af9d0c5aeffab68166eec154c822b7c1c9c0697823d5b alpine-conf-2.14.0.tar.xz
754a59868f069c4eb2321034f00539ea02e734ede1a483b9c9ec5360c788f8c1 0001-setup-bootable-use-UUID-on-new-USBs.patch
a410da99de3ef31a7a8a537aeb0fcd0ab53027e6febd95e15c1accdc49c135ee 0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch"
a410da99de3ef31a7a8a537aeb0fcd0ab53027e6febd95e15c1accdc49c135ee 0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch
3972fe5f588ca363f6fff328f0082ed584d72201f160606ee66b248e7de82f42 0001-Let-is_xen_dom0-fail-silently.patch"
sha512sums="39aa74e676221475ce088d82b134563c3dd04a69e90919089d3876b6a4715f6df58aa156352a40d9f817414cbdb603350a3e9c15914fb254a24d8cef4acd6581 alpine-conf-2.14.0.tar.xz
3b2d2fb754421f7dd4c45c7212544c2f34587da9da10e777ee9de153dd77e70d016bf8b270d72dd6ee8299c99a17f2969bddef586afbdcac13b4d76c87bcc35e 0001-setup-bootable-use-UUID-on-new-USBs.patch
32bc771eba2b912623dd5b0c96571d0770afc370c354831353f2ebda5e396323f1cebfddc36d8ac3ee8028a1554a0163ecdaa9cca108097002282f838139f5b6 0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch"
32bc771eba2b912623dd5b0c96571d0770afc370c354831353f2ebda5e396323f1cebfddc36d8ac3ee8028a1554a0163ecdaa9cca108097002282f838139f5b6 0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch
c921a63b7fdfa3526b1ee0e5b3b1aa29fdddba02429cad4b88411885f5c2460e3bffd99bab02d3bbf21c5d53567fccff22ec394e652f37b606b9713d0dad2847 0001-Let-is_xen_dom0-fail-silently.patch"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment