X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from mail-gy0-f182.google.com (mail-gy0-f182.google.com [209.85.160.182]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 5DF83DC0179 for ; Mon, 30 Apr 2012 12:30:06 +0000 (UTC) Received: by ghrr20 with SMTP id r20so1462454ghr.13 for ; Mon, 30 Apr 2012 05:30:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=ww1YbKGeTuJLWdVmublwHKuoKCTOYY/HCXNFAI2VwRY=; b=UwTzk6JwIiyP5PC97thwQhDTPnWuzn4tvbNJLsWJVmJaZ5oLgKoqkHasvqkdQTn5+O qT4wgHvUcr5jTSSlhzrtB70tIAqox01EkjbK5JTJlArCl6bKU9a3lYmW3gPCyqxNjjUf pzMSvAv85hUga9gqUrbTBBzoTOqYGRGpbm7uNI5rpg1mvORGTEISKW9CEYeqf+QH7/A7 h0tT4Y74E7i5hme5rJMVJQ7ivSiQs+vxevPTWQ2ANXzJui+uSOQ6n5bhiYjdIhWaUEnz u0+BE4hkgudRauJq6uZ4ssRxgaG4XPVsBPCYyCTsjEFYreC6bfP9Use8DipZo4skTxIQ Lk9Q== Received: by 10.236.85.209 with SMTP id u57mr22352715yhe.20.1335789005655; Mon, 30 Apr 2012 05:30:05 -0700 (PDT) Received: from alpine-build.uk.xensource.com (firewall.ctxuk.citrix.com. [62.200.22.2]) by mx.google.com with ESMTPS id u20sm73619216yhi.10.2012.04.30.05.30.03 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 30 Apr 2012 05:30:04 -0700 (PDT) Sender: =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= From: Roger Pau Monne To: alpine-devel@lists.alpinelinux.org Cc: Roger Pau Monne Subject: [alpine-devel] [PATCH] main/xen: fix xenstored init script Date: Mon, 30 Apr 2012 13:29:39 +0100 Message-Id: <1335788979-9286-1-git-send-email-roger.pau@entel.upc.edu> X-Mailer: git-send-email 1.7.10 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Mount /proc/xen on init if it's not mounted. Signed-off-by: Roger Pau Monne --- main/xen/APKBUILD | 7 +++++-- main/xen/xenstored.initd | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD index 5e6a93e..993cfb2 100644 --- a/main/xen/APKBUILD +++ b/main/xen/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: William Pitcock pkgname=xen pkgver=4.1.2 -pkgrel=7 +pkgrel=8 pkgdesc="Xen hypervisor" url="http://www.xen.org/" arch="x86 x86_64" @@ -85,6 +85,9 @@ package() { make -j1 DESTDIR="$pkgdir" install-xen install-tools install-stubdom \ || return 1 + # remove default xencommons + rm -rf "$pkgdir"/etc/init.d/xencommons + for i in $source; do case $i in *.initd) install -Dm755 "$srcdir"/$i \ @@ -108,7 +111,7 @@ a7500c42804abdf68e051dc667e65f93 pygrub_alpine.patch fa06495a175571f4aa3b6cb88937953e librt.patch 1bea3543ddc712330527b62fd9ff6520 busybox-sed.patch c31163a3cd6cf58b4e9cac0e96812d65 e1000.patch -095b20f33bd0fb3963002722870b1dda xenstored.initd +6e5739dad7e2bd1b625e55ddc6c782b7 xenstored.initd b017ccdd5e1c27bbf1513e3569d4ff07 xenstored.confd ed262f15fb880badb53575539468646c xenconsoled.initd ec2252c72050d7d5870a3a629b873ba6 xenconsoled.confd diff --git a/main/xen/xenstored.initd b/main/xen/xenstored.initd index bbb4efb..f2c22cc 100644 --- a/main/xen/xenstored.initd +++ b/main/xen/xenstored.initd @@ -23,6 +23,13 @@ wait_xenstored_up() { start() { local _traceopt= ebegin "Starting xenstored daemon" + + if ! test -f /proc/xen/capabilities && \ + ! grep '^xenfs ' /proc/mounts >/dev/null; + then + mount -t xenfs xenfs /proc/xen + fi + modprobe xen-evtchn 2>/dev/null modprobe xen-gntdev 2>/dev/null modprobe evtchn 2>/dev/null -- 1.7.10 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---