From patchwork Mon Aug 21 07:18:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajiv Ranganath X-Patchwork-Id: 9911657 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 8F673602D8 for ; Mon, 21 Aug 2017 07:20:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80C7B28709 for ; Mon, 21 Aug 2017 07:20:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7569128720; Mon, 21 Aug 2017 07:20:26 +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 F310F28709 for ; Mon, 21 Aug 2017 07:20:25 +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 1djgye-0006B3-QP; Mon, 21 Aug 2017 07:18:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1djgyd-0006AF-JG for xen-devel@lists.xen.org; Mon, 21 Aug 2017 07:18:23 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 6F/8B-01993-E398A995; Mon, 21 Aug 2017 07:18:22 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHIsWRWlGSWpSXmKPExsXiVRusqWvXOSv S4OI3ZoslHxezODB6HN39mymAMYo1My8pvyKBNeP8hP2MBSvVK7b9e8DawLhDqYuRi0NIYBKj RHvzFRYQh0VgH6vEi5+T2UEcCYGDrBLHr09n7WLkBHLSJGadusYOYVdLHNvdwwRiCwloSTQuO MgGMeobo8S5rjNsIAk2AWOJJYceg9kiAtIS1z5fZuxi5OBgFpCSOH3QHCQsLBAhMev0IxYQm0 VAVeLp87tgNq+Am8T+K10sELvkJBrO32cGsTkFPCRe7p7CArHXXWLf9ANgN4gC1ay83MIK0Ss ocXLmExaIVZoS63fpg4SZBeQltr+dwzyBUWQWkqpZCFWzkFQtYGRexahRnFpUllqka2ihl1SU mZ5RkpuYmaNraGCql5taXJyYnpqTmFSsl5yfu4kRGP4MQLCDsWm75yFGSQ4mJVHeDamzIoX4k vJTKjMSizPii0pzUosPMcpwcChJ8DJ0AOUEi1LTUyvSMnOAkQiTluDgURLhXd4OlOYtLkjMLc 5Mh0idYrTk2LB6/Rcmjjt9G4DkpAPbvzAJseTl56VKifNag8wTAGnIKM2DGwdLFpcYZaWEeRm BDhTiKUgtys0sQZV/xSjOwagkzMsFMoUnM68EbusroIOYgA4ybJ0GclBJIkJKqoEx+dHVyXmG bS+e7fJd7nCX91STfMrDRnfhz+487sYii78t3fM34Lf/DMb3uWt9CyZuKWOfFJN6MFPM6rDQm pOiHpISoabv3sh/sbH7LHN45/eY7Gl9/UZMO4sepqRqpW5Q2KqxRHc9U63V6c/bz5VPnMxZxp xTfLGZ92/73rl7DPS5Zf4+TPiixFKckWioxVxUnAgA26MsUBEDAAA= X-Env-Sender: rajiv.ranganath@atihita.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1503299900!87475912!1 X-Originating-IP: [74.125.83.41] 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 32345 invoked from network); 21 Aug 2017 07:18:21 -0000 Received: from mail-pg0-f41.google.com (HELO mail-pg0-f41.google.com) (74.125.83.41) by server-2.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 21 Aug 2017 07:18:21 -0000 Received: by mail-pg0-f41.google.com with SMTP id y129so94838671pgy.4 for ; Mon, 21 Aug 2017 00:18:21 -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=8HK2KjMZL2BNZNw/70l98+B0HxcVBLu21nWGnl7Y5rk=; b=zRUv7LxDrzUuUWudLaF/oyvEFrK3oEN4BVYf9+c0At2E09l2RKnPJZAlz1XNUmISpq mw+GGxVoUqLTFpj/Hb6v8zYWYfSjqrEhYi4WZf8QCW5EgjTXx2dOc+lM9I00aU24kL8Y bg1eo+0J7ns55l15AUDYF5A5JznQoKOveSotDeYDUMO3O8ZjbQWvMwxPbgyn2JyjOqgC gqHdLWzGnD+iTVMlcHS3ShFRmx2GyUNfMioJcrjPlVfNdCqEBQc63TI6EZbZfpJ6DMdA GOvX2qj8qD/IMsxWXRqjS+Ukh8rKHU+K+oH3guFYS8h0lP8f35LeUQRz2FmJYwKX37sI EBLA== 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=8HK2KjMZL2BNZNw/70l98+B0HxcVBLu21nWGnl7Y5rk=; b=pam5WcthOLFhqmBONXzs92WqVD0YycrOMrupC0tSxRuu5VXK0Mgks/mrAyKXoTKmmy us+B7BO1PCKKRQwO6fRfxjq6lBwMKk/ndexTVsu09OisJuSLeuRk4exe4Q7EpTrE2v03 NMKeDRyiQ2UF6/qy/dCpUT4NRb0+5H9I98odZGwImv7o+5wWVQPGyLq54mELiS6ZRvCA /Ja2FjRGHvahHR68ugQET1smzm2cWu4t9se7kk/vhP586z7UJ96pef39DOIcKf/7dKK+ f7UPdH2UL9dN2i00V9xsl1qkupYS5P04KE9Qd6733no5qRgYpsqIvNQBdarKmReX6VBX In3w== X-Gm-Message-State: AHYfb5gbGHr6kIAC0vKpgwMTvKMO/VbEWgxssek9Eqfy0JSLyyI2VijW JlDYi2Ow+T9dakgxatPHjg== X-Received: by 10.84.210.203 with SMTP id a69mr18109916pli.395.1503299900052; Mon, 21 Aug 2017 00:18:20 -0700 (PDT) Received: from localhost ([103.205.217.54]) by smtp.gmail.com with ESMTPSA id j73sm26636149pfa.117.2017.08.21.00.18.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Aug 2017 00:18:19 -0700 (PDT) From: Rajiv Ranganath To: xen-devel@lists.xen.org Date: Mon, 21 Aug 2017 12:48:17 +0530 Message-Id: <20170821071817.65172.6416.stgit@rajivs-macbook-pro.local> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170821071721.65172.78369.stgit@rajivs-macbook-pro.local> References: <20170821071721.65172.78369.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 (RFC) PATCH 06/10] build/fedora: Add `xen-unstable-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 --- build/fedora/xen-unstable-runit/setup.sh | 21 ++++++++++++++++++++ build/fedora/xen-unstable-runit/teardown.sh | 21 ++++++++++++++++++++ .../xen-init-dom0-disk-backend/run | 8 ++++++++ build/fedora/xen-unstable-runit/xen-init-dom0/run | 6 ++++++ build/fedora/xen-unstable-runit/xenconsoled/run | 10 ++++++++++ build/fedora/xen-unstable-runit/xenstored/run | 20 +++++++++++++++++++ 6 files changed, 86 insertions(+) create mode 100755 build/fedora/xen-unstable-runit/setup.sh create mode 100755 build/fedora/xen-unstable-runit/teardown.sh create mode 100755 build/fedora/xen-unstable-runit/xen-init-dom0-disk-backend/run create mode 100755 build/fedora/xen-unstable-runit/xen-init-dom0/run create mode 100755 build/fedora/xen-unstable-runit/xenconsoled/run create mode 100755 build/fedora/xen-unstable-runit/xenstored/run diff --git a/build/fedora/xen-unstable-runit/setup.sh b/build/fedora/xen-unstable-runit/setup.sh new file mode 100755 index 0000000..16699be --- /dev/null +++ b/build/fedora/xen-unstable-runit/setup.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -e +set -o pipefail + +# 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" + +pushd /etc/service > /dev/null +for service in $runit_services; do + ln -sf /opt/xen-unstable-runit/$service $service +done +popd > /dev/null + +echo "Successfully created symlinks in /etc/service directory." +exit 0 diff --git a/build/fedora/xen-unstable-runit/teardown.sh b/build/fedora/xen-unstable-runit/teardown.sh new file mode 100755 index 0000000..c0895f4 --- /dev/null +++ b/build/fedora/xen-unstable-runit/teardown.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -e +set -o pipefail + +# 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" + +pushd /etc/service > /dev/null +for service in $runit_services; do + rm -f $service +done +popd > /dev/null + +echo "Successfully deleted symlinks in /etc/service directory." +exit 0 diff --git a/build/fedora/xen-unstable-runit/xen-init-dom0-disk-backend/run b/build/fedora/xen-unstable-runit/xen-init-dom0-disk-backend/run new file mode 100755 index 0000000..a952890 --- /dev/null +++ b/build/fedora/xen-unstable-runit/xen-init-dom0-disk-backend/run @@ -0,0 +1,8 @@ +#!/bin/sh +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-unstable/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-unstable-runit/xen-init-dom0/run b/build/fedora/xen-unstable-runit/xen-init-dom0/run new file mode 100755 index 0000000..f7f56ed --- /dev/null +++ b/build/fedora/xen-unstable-runit/xen-init-dom0/run @@ -0,0 +1,6 @@ +#!/bin/sh +sv check xenstored >/dev/null || exit 1 + +/opt/xen-unstable/lib/xen/bin/xen-init-dom0 + +exec chpst -b xen-init-dom0 runit-pause diff --git a/build/fedora/xen-unstable-runit/xenconsoled/run b/build/fedora/xen-unstable-runit/xenconsoled/run new file mode 100755 index 0000000..7a3ab4e --- /dev/null +++ b/build/fedora/xen-unstable-runit/xenconsoled/run @@ -0,0 +1,10 @@ +#!/bin/sh +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-unstable/sbin/xenconsoled -i --log=none diff --git a/build/fedora/xen-unstable-runit/xenstored/run b/build/fedora/xen-unstable-runit/xenstored/run new file mode 100755 index 0000000..42e5e41 --- /dev/null +++ b/build/fedora/xen-unstable-runit/xenstored/run @@ -0,0 +1,20 @@ +#!/bin/sh +[ ! -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-unstable/sbin/xenstored --no-fork