X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 82827DC19A5 for ; Wed, 7 Mar 2012 10:43:51 +0000 (UTC) Received: by wibhn6 with SMTP id hn6so4304284wib.13 for ; Wed, 07 Mar 2012 02:43:50 -0800 (PST) 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=XALcsWcYaGmccSBIRH9dC128q84g4hYzDnHWkq4ANG0=; b=zESt+zyf0y15FcDsrxoOfSqSCzFvYxlXaxYkMKDUQFucbRZu6OV+ze9gaaI4t7fmbV bkEKu7kNPhTHIMAw+bgT0WR5ldQa51RdhlfOcSIx9xDK88OojnrzH2Mm60fK0VfDH2Af w01nFrvfuKwIUK8CpkwN5MITv646vMe/DDmgvo4cA/1ri4nDFzObtwom0uOn68XjF9vn bzCGNZlZR/q6o9XJP0ghX/1d2F+VaX+SeThSO9MeVTRCVEv18ERVjyHlW9fivnMeWIil 6NVI78ILCPvYskn1bqmpu1IWsMRh6H4Pmte++lyiN+9TT8lW68ThO7iVQy+8702ozdjE AJfw== Received: by 10.180.100.196 with SMTP id fa4mr3953925wib.0.1331117030319; Wed, 07 Mar 2012 02:43:50 -0800 (PST) Received: from build.localdomain (tina.upc.es. [147.83.39.243]) by mx.google.com with ESMTPS id hn8sm93281682wib.11.2012.03.07.02.43.49 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Mar 2012 02:43:49 -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: fix xendomains init script Date: Wed, 22 Feb 2012 00:19:13 +0100 Message-Id: <1329866353-3996-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/xendomains.initd | 59 ++++++++++++++++++++++++++------------------- 2 files changed, 36 insertions(+), 27 deletions(-) mode change 100644 => 100755 main/xen/xendomains.initd diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD index d2ee0b6..4c26644 100644 --- a/main/xen/APKBUILD +++ b/main/xen/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: William Pitcock pkgname=xen pkgver=4.1.2 -pkgrel=5 +pkgrel=6 pkgdesc="Xen hypervisor" url="http://www.xen.org/" arch="x86 x86_64" @@ -95,4 +95,4 @@ fa06495a175571f4aa3b6cb88937953e librt.patch c31163a3cd6cf58b4e9cac0e96812d65 e1000.patch 62b3c5a7cff38c12df2de89af5d83fa1 xencommons.initd b5bfc08b82bc0d21193714719a719798 xend.initd -86e7923383a906404da321d1814657e9 xendomains.initd" +6c288547faadd4262afd2f86e39e99a3 xendomains.initd" diff --git a/main/xen/xendomains.initd b/main/xen/xendomains.initd old mode 100644 new mode 100755 index 0f309ef..5077d82 --- a/main/xen/xendomains.initd +++ b/main/xen/xendomains.initd @@ -1,26 +1,5 @@ #!/sbin/runscript -CMD=xm -/usr/sbin/$CMD list &> /dev/null -if test $? -ne 0 -then - CMD=xl -fi - -/usr/sbin/$CMD list &> /dev/null -if test $? -ne 0 -then - eend 1; - exit 1; -fi - -# Correct exit code would probably be 5, but it's enough -# if xend complains if we're not running as privileged domain -if ! [ -e /proc/xen/privcmd ]; then - eend 1; - exit 1; -fi - # See docs/misc/distro_mapping.txt if [ -d /var/lock/subsys ]; then LOCKFILE=/var/lock/subsys/xendomains @@ -37,7 +16,7 @@ fi if ! [ -r $XENDOM_CONFIG ]; then eend 1; echo "$XENDOM_CONFIG not existing"; - exit 1; + return 1; fi . $XENDOM_CONFIG @@ -61,14 +40,41 @@ is_running() { /usr/sbin/$CMD list "${1}" >/dev/null 2>&1 } +check_xen() { + CMD=xm + /usr/sbin/$CMD list &> /dev/null + if test $? -ne 0 + then + CMD=xl + fi + + /usr/sbin/$CMD list &> /dev/null + if test $? -ne 0 + then + eend 1; + echo "Could not find xl or xm"; + return 1; + fi + + # Correct exit code would probably be 5, but it's enough + # if xend complains if we're not running as privileged domain + if ! [ -e /proc/xen/privcmd ]; then + eend 1; + echo "Could not find /proc/xen/privcmd"; + return 1; + fi +} + start() { einfo "Starting Xen domains in ${AUTODIR:=/etc/xen/auto}" + check_xen + for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do name=$(get_domname ${dom}) if ! is_running ${name} ; then ebegin " Starting domain ${name}" - /usr/sbin/$CMD create --quiet --defconfig ${dom} + /usr/sbin/$CMD create --quiet --defconfig ${dom} >/dev/null 2>&1 eend $? else einfo " Not starting ${name} - already running." @@ -79,11 +85,13 @@ start() { stop() { einfo "Stopping Xen domains in ${AUTODIR:=/etc/xen/auto}" + check_xen + for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do name=$(get_domname ${dom}) if is_running ${name} ; then ebegin " Sending shutdown signal to ${name}" - /usr/sbin/$CMD shutdown ${name} >/dev/null + /usr/sbin/$CMD shutdown ${name} >/dev/null 2>&1 eend $? fi done @@ -92,7 +100,7 @@ stop() { name=$(get_domname ${dom}) if is_running ${name} ; then ebegin " Waiting for domain ${name} to shutdown" - /usr/sbin/$CMD shutdown --wait ${name} + /usr/sbin/$CMD shutdown --wait ${name} >/dev/null 2>&1 eend $? else einfo " Not stopping ${name} - not running." @@ -101,5 +109,6 @@ stop() { } status() { + check_xen /usr/sbin/$CMD list } -- 1.7.9 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---