From patchwork Tue Sep 19 06:58:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajiv Ranganath X-Patchwork-Id: 9958289 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 456206038F for ; Tue, 19 Sep 2017 07:01:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B58128D1C for ; Tue, 19 Sep 2017 07:01:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4026728D47; Tue, 19 Sep 2017 07:01:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 46A7A28D3E for ; Tue, 19 Sep 2017 07:01:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1duCUZ-0004vI-Id; Tue, 19 Sep 2017 06:58:47 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1duCUZ-0004ui-6R for xen-devel@lists.xen.org; Tue, 19 Sep 2017 06:58:47 +0000 Received: from [193.109.254.147] by server-1.bemta-6.messagelabs.com id A4/76-03414-620C0C95; Tue, 19 Sep 2017 06:58:46 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplleJIrShJLcpLzFFi42Lxqg3W0lU9cCD SYEOnqsWSj4tZHBg9ju7+zRTAGMWamZeUX5HAmvH9pkzBTbWKuyuWsDYwvlbsYuTiEBKYwCix bMV1ZhCHRWAfq8SHTasYQRwJgYOsEscmHGXrYuQEcvIkOo/dYeli5ACy0yS+bpSCCFdJ3G49z AhiCwloSTQuOMgGMfUjo8Tdx/uYQRJsAsYSSw49BpsjIiAtce3zZUaQOcwCUhKnD5qDhIUFgi Tmb58OVsIioCrRfAtkFScHr4CrxIneO8wQu+QkGs7fB7M5Bdwl1p/ZwASx101i2p/Z7CC2KFD NysstrBC9ghInZz5hgVilKbF+lz5ImFlAXmL72znMExhFZyGpmoVQNQtJ1QJG5lWM6sWpRWWp RbrmeklFmekZJbmJmTm6hgZmermpxcWJ6ak5iUnFesn5uZsYgRHBAAQ7GGde9j/EKMnBpCTKG 7bpQKQQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCV6+/UA5waLU9NSKtMwcYGzCpCU4eJREeEv3Aa V5iwsSc4sz0yFSpxjtOY5tuvyHiePHpCtAct+eW0Cy4+bdP0xCLHn5ealS4rzxIFMFQNoySvP ghsJSySVGWSlhXkagM4V4ClKLcjNLUOVfMYpzMCoJ8/4EWc6TmVcCt/sV0FlMQGdlbwA7qyQR ISXVwNhyZp7TpT9qhktCcuccW6I+p0L7QpThAekumYcpGYf0u5u4O6/MbZAu3bwo62HRjvuLb QWmvVhh284bkaGsv3Rn/OUFqzzivmR6Xt5TZHeFVypg1ecg/bTLvHm2Hx/fzb28wnh5arfU6m xTDgfeDLtGxz1nUptED3fJ1ZTaqO/+e1z609R2ByWW4oxEQy3mouJEACZtbeYgAwAA X-Env-Sender: rajiv.ranganath@atihita.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1505804324!117120079!1 X-Originating-IP: [74.125.83.42] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30078 invoked from network); 19 Sep 2017 06:58:45 -0000 Received: from mail-pg0-f42.google.com (HELO mail-pg0-f42.google.com) (74.125.83.42) by server-3.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 19 Sep 2017 06:58:45 -0000 Received: by mail-pg0-f42.google.com with SMTP id j16so1541836pga.1 for ; Mon, 18 Sep 2017 23:58:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atihita-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=7P/r3Kr6Jbu23NCbyxkMO1cW9Y6NHeWwDNBixeDIfMw=; b=YEdSdcfEJwjulfbAqtwkRq4BOSfwJLlgXYhhhmJl3JoQ3ORtUzpETXvh3REZXLLogR nCg1SSN+Wh7zrs7vXSk5RnjPuzDWBFDlqT911Jik96gOupKQtqetnnILgMI9xZbkIrLh rwI4Zfx6ZPPMTf8rV5XeO9gs/q/O88UxZHaKYvBw0yxwLBQABDPA8swacZQYFvXLaMuf i/8YYVaKzHnLZdHw5LkSn+MBolbOZQS/uSR+53ZeskonsMsBYKP2+wIG89UiIj2CZ0BO QHuahKiGO1RkwKsoUJ08+cr2rGiauNSXXhDvt+5mUqrTHLB7iIZv9PtJVuOkXfQgVHsX lpCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=7P/r3Kr6Jbu23NCbyxkMO1cW9Y6NHeWwDNBixeDIfMw=; b=iOdzeq2+ZfY35nIrxEvNqCGhF9aAwxaYUFUkQKDhrqciKRpZvrq3++ADM/iw46ckMU LZ2q+0pj25L5kOFbHAmd5OWBMF6ibFddf6d/8o8rRY1T3hX3XAgnsld0chIpzDUNMiEU FxIVoAXcyYjcoS5KQhjKMBQILS/3q+H6WgRNUZyHnZgpcqt9V85uuDgH3dcz74dGShvk aQeAPzOFOd090/ANWLoR1m5s41W3N6eXHKkCc57HZX8a7QjrenhN4sgIt4ik0b2w0e71 VK/yKpfqT5QWx/Jn0DnxDxhtigMVCFjdzFfv3owbX4tZXPcmuZhk9rcYMLC3yA9lHZ65 0M8A== X-Gm-Message-State: AHPjjUg1x3mJd2e0Juv3cR+X9pPndIcW28xqituG4UJqvDAZ7MZdVJ4l 4SktzJIO6o0fZ5b7qxR7WalIMfypOvk= X-Google-Smtp-Source: AOwi7QCI/eFYFNGJH3/3kHnhCrScw89fe2BlMB/1MWz9FS5/mMVnOGpXXDgOJ6jGK8D/1+o3waEUjQ== X-Received: by 10.98.207.134 with SMTP id b128mr414966pfg.202.1505804323512; Mon, 18 Sep 2017 23:58:43 -0700 (PDT) Received: from localhost ([59.93.108.6]) by smtp.gmail.com with ESMTPSA id z89sm1977090pff.13.2017.09.18.23.58.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Sep 2017 23:58:43 -0700 (PDT) From: Rajiv Ranganath To: xen-devel@lists.xen.org Date: Tue, 19 Sep 2017 12:28:40 +0530 Message-Id: <20170919065840.1913.2101.stgit@rajivs-macbook-pro.local> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170919065749.1913.30583.stgit@Rajivs-MacBook-Pro.local> References: <20170919065749.1913.30583.stgit@Rajivs-MacBook-Pro.local> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Cc: sstabellini@kernel.org Subject: [Xen-devel] [stage1-xen PATCH v2 06/11] build/fedora: Add `xen-4.9.0-runit/*` scripts X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Rajiv M Ranganath Signed-off-by: Rajiv Ranganath Acked-by: Stefano Stabellini --- build/fedora/xen-4.9.0-runit/setup.sh | 18 ++++++++++++++++ build/fedora/xen-4.9.0-runit/teardown.sh | 18 ++++++++++++++++ .../xen-4.9.0-runit/xen-init-dom0-disk-backend/run | 11 ++++++++++ build/fedora/xen-4.9.0-runit/xen-init-dom0/run | 9 ++++++++ build/fedora/xen-4.9.0-runit/xenconsoled/run | 13 +++++++++++ build/fedora/xen-4.9.0-runit/xenstored/run | 23 ++++++++++++++++++++ 6 files changed, 92 insertions(+) create mode 100755 build/fedora/xen-4.9.0-runit/setup.sh create mode 100755 build/fedora/xen-4.9.0-runit/teardown.sh create mode 100755 build/fedora/xen-4.9.0-runit/xen-init-dom0-disk-backend/run create mode 100755 build/fedora/xen-4.9.0-runit/xen-init-dom0/run create mode 100755 build/fedora/xen-4.9.0-runit/xenconsoled/run create mode 100755 build/fedora/xen-4.9.0-runit/xenstored/run diff --git a/build/fedora/xen-4.9.0-runit/setup.sh b/build/fedora/xen-4.9.0-runit/setup.sh new file mode 100755 index 0000000..935d332 --- /dev/null +++ b/build/fedora/xen-4.9.0-runit/setup.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +set -e + +# runit RPM creates `/etc/service` directory +if [ ! -d "/etc/service" ]; then + echo "/etc/service directory not found. Please install runit RPM." + exit 1 +fi + +runit_services="xenconsoled xen-init-dom0 xen-init-dom0-disk-backend xenstored" + +for service in $runit_services; do + ln -sf /opt/xen-4.9.0-runit/$service /etc/service/$service +done + +echo "Successfully created symlinks in /etc/service directory." +exit 0 diff --git a/build/fedora/xen-4.9.0-runit/teardown.sh b/build/fedora/xen-4.9.0-runit/teardown.sh new file mode 100755 index 0000000..d333807 --- /dev/null +++ b/build/fedora/xen-4.9.0-runit/teardown.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +set -e + +# runit RPM creates `/etc/service` directory +if [ ! -d "/etc/service" ]; then + echo "/etc/service directory not found." + exit 1 +fi + +runit_services="xenconsoled xen-init-dom0 xen-init-dom0-disk-backend xenstored" + +for service in $runit_services; do + rm -f /etc/service/$service +done + +echo "Successfully deleted symlinks in /etc/service directory." +exit 0 diff --git a/build/fedora/xen-4.9.0-runit/xen-init-dom0-disk-backend/run b/build/fedora/xen-4.9.0-runit/xen-init-dom0-disk-backend/run new file mode 100755 index 0000000..a59660c --- /dev/null +++ b/build/fedora/xen-4.9.0-runit/xen-init-dom0-disk-backend/run @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +sv check xenstored >/dev/null || exit 1 +sv check xenconsoled >/dev/null || exit 1 + +# In case of failure, allow user to run teardown script +sleep 5s + +exec /opt/xen-4.9.0/lib/xen/bin/qemu-system-i386 -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -monitor /dev/null -serial /dev/null -parallel /dev/null -nodefaults -no-user-config diff --git a/build/fedora/xen-4.9.0-runit/xen-init-dom0/run b/build/fedora/xen-4.9.0-runit/xen-init-dom0/run new file mode 100755 index 0000000..3b98091 --- /dev/null +++ b/build/fedora/xen-4.9.0-runit/xen-init-dom0/run @@ -0,0 +1,9 @@ +#!/bin/bash + +set -e + +sv check xenstored >/dev/null || exit 1 + +/opt/xen-4.9.0/lib/xen/bin/xen-init-dom0 + +exec chpst -b xen-init-dom0 runit-pause diff --git a/build/fedora/xen-4.9.0-runit/xenconsoled/run b/build/fedora/xen-4.9.0-runit/xenconsoled/run new file mode 100755 index 0000000..a1c9a2c --- /dev/null +++ b/build/fedora/xen-4.9.0-runit/xenconsoled/run @@ -0,0 +1,13 @@ +#!/bin/bash + +set -e + +sv check xen-init-dom0 >/dev/null || exit 1 + +[ ! -d /var/log/xen/console ] && mkdir -p /var/log/xen/console + +# In case of failure, allow user to run teardown script +sleep 5s + +# --log=[none|guest|hv|all] +exec /opt/xen-4.9.0/sbin/xenconsoled -i --log=none diff --git a/build/fedora/xen-4.9.0-runit/xenstored/run b/build/fedora/xen-4.9.0-runit/xenstored/run new file mode 100755 index 0000000..e49eb64 --- /dev/null +++ b/build/fedora/xen-4.9.0-runit/xenstored/run @@ -0,0 +1,23 @@ +#!/bin/bash + +set -e + +[ ! -d /var/run/xen ] && mkdir -p /var/run/xen +[ ! -d /var/run/xenstored ] && mkdir -p /var/run/xenstored +[ ! -d /var/log/xen ] && mkdir -p /var/log/xen +[ ! -d /var/lib/xen ] && mkdir -p /var/lib/xen +[ ! -d /var/lib/xen/dump ] && mkdir -p /var/lib/xen/dump +[ ! -d /var/lib/xen/xenpaging ] && mkdir -p /var/lib/xen/paging +[ ! -d /var/lib/xenstored ] && mkdir -p /var/lib/xenstored +modprobe -q xen-evtchn || exit 1 +modprobe -q xen-gntdev || exit 1 +modprobe -q xen-gntalloc || exit 1 +mountpoint -q /proc/xen || mount -t xenfs xenfs /proc/xen +mountpoint -q /var/lib/xenstored || mount -t tmpfs xenstored /var/lib/xenstored +grep -q "control_d" /proc/xen/capabilities || exit 1 + +# In case of failure, allow user to run teardown script +sleep 5s + +# Use `--trace-file /var/log/xen/xenstored-trace.log` for logs +exec /opt/xen-4.9.0/sbin/xenstored --no-fork