X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from mail-ww0-f44.google.com (mail-ww0-f44.google.com [74.125.82.44]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 1AF4ADC1934 for ; Tue, 14 Feb 2012 09:35:49 +0000 (UTC) Received: by wgbdt10 with SMTP id dt10so4443223wgb.25 for ; Tue, 14 Feb 2012 01:35:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=TssoFZ0mEGm9h2U+Mx1S4gKdpPfDM3mpRaR0OOqsJAw=; b=JhmOBuvrucVOPkplJiuKUDqHrtP9DTUB0grMt9RAqFhJJnCSQKcLmKzRxwQjCgPwNa So4NyYBAAMKFF55xXQSlUp8d7zjZ5maXFXucFFtvybEObOVKmCjl4fEAqsrv6NPj9J+G 3OOLEeg+WIPjeMFuTW1sOd0M9yijBkECAFBVg= Received: by 10.180.78.233 with SMTP id e9mr2393743wix.0.1329212148839; Tue, 14 Feb 2012 01:35:48 -0800 (PST) Received: from build.localdomain (tina.upc.es. [147.83.39.243]) by mx.google.com with ESMTPS id m8sm55021985wia.11.2012.02.14.01.35.48 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Feb 2012 01:35:48 -0800 (PST) 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: update to match new OpenRC and kernel 3.2 Date: Wed, 8 Feb 2012 10:09:23 +0100 Message-Id: <1328692163-21802-1-git-send-email-roger.pau@entel.upc.edu> X-Mailer: git-send-email 1.7.9 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/xen/APKBUILD | 4 ++-- main/xen/xencommons.initd | 29 +++++++++++++---------------- 2 files changed, 15 insertions(+), 18 deletions(-) mode change 100644 => 100755 main/xen/xencommons.initd diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD index 0fe61ee..0ec727e 100644 --- a/main/xen/APKBUILD +++ b/main/xen/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: William Pitcock pkgname=xen pkgver=4.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="Xen hypervisor" url="http://www.xen.org/" arch="x86 x86_64" @@ -91,6 +91,6 @@ b973dc1ffcc6872e222b36f3b7b4836b fix_bswap_blktap2.patch a7500c42804abdf68e051dc667e65f93 pygrub_alpine.patch fa06495a175571f4aa3b6cb88937953e librt.patch 1bea3543ddc712330527b62fd9ff6520 busybox-sed.patch -4cf88b53f8ca8d99ad52bae419b620a7 xencommons.initd +62b3c5a7cff38c12df2de89af5d83fa1 xencommons.initd b5bfc08b82bc0d21193714719a719798 xend.initd 86e7923383a906404da321d1814657e9 xendomains.initd" diff --git a/main/xen/xencommons.initd b/main/xen/xencommons.initd old mode 100644 new mode 100755 index 3d3c5da..7543cae --- a/main/xen/xencommons.initd +++ b/main/xen/xencommons.initd @@ -18,22 +18,6 @@ if ! test -d /proc/xen ; then exit 0 fi -# mount xenfs in dom0 or domU with a pv_ops kernel -if test "x$1" = xstart && \ - ! test -f /proc/xen/capabilities && \ - ! grep '^xenfs ' /proc/mounts >/dev/null; -then - mount -t xenfs xenfs /proc/xen -fi - -# run this script only in dom0: -# no capabilities file in xenlinux domU kernel -# empty capabilities file in pv_ops domU kernel -if test -f /proc/xen/capabilities && \ - ! grep -q "control_d" /proc/xen/capabilities ; then - exit 0 -fi - depend() { need udev before xend @@ -48,6 +32,19 @@ start() { modprobe evtchn 2>/dev/null modprobe gntdev 2>/dev/null + # mount xenfs in dom0 or domU with a pv_ops kernel + if ! test -f /proc/xen/capabilities && \ + ! grep '^xenfs ' /proc/mounts >/dev/null; + then + mount -t xenfs xenfs /proc/xen + fi + + # assert we are running in the dom0 + if test -f /proc/xen/capabilities && \ + ! grep -q "control_d" /proc/xen/capabilities ; then + exit 0 + fi + if ! `xenstore-read -s / >/dev/null 2>&1` then test -z "$XENSTORED_ROOTDIR" || XENSTORED_ROOTDIR="/var/lib/xenstored" -- 1.7.9 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---