From patchwork Sun Aug 27 03:01:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajiv Ranganath X-Patchwork-Id: 9923661 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 D991060380 for ; Sun, 27 Aug 2017 03:03:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB02128583 for ; Sun, 27 Aug 2017 03:03:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFD6A2858F; Sun, 27 Aug 2017 03:03:31 +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 14CDD28583 for ; Sun, 27 Aug 2017 03:03:31 +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 1dlnp9-0005Qo-Rm; Sun, 27 Aug 2017 03:01:19 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dlnp8-0005Q8-Oe for xen-devel@lists.xen.org; Sun, 27 Aug 2017 03:01:18 +0000 Received: from [193.109.254.147] by server-10.bemta-6.messagelabs.com id DB/A0-18185-EF532A95; Sun, 27 Aug 2017 03:01:18 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmleJIrShJLcpLzFFi42K5GHpgre5f00W RBu/mcVks+biYxYHR4+ju30wBjFGsmXlJ+RUJrBlr155gLdigXjFv4nL2BsaDSl2MXBxCAhMZ JV4um88E4rAI7GOVuNffyALiSAgcZJVY3/EByOEEctIkvt+7xAxhl0nc6n0PFhcS0JJoXHCQD WLUd0aJffs+gyXYBIwllhx6zAZiiwhIS1z7fJmxi5GDg1lASuL0QXOQsLBAqMSaWWvASlgEVC WW3NjABGLzCrhKNHyfwAaxS06i4fx9sL2cAh4S21+8ZIXY6y7x6et6sHpRoJqVl1tYIXoFJU7 OfMICsUpTYv0ufZAws4C8xPa3c5gnMIrMQlI1C6FqFpKqBYzMqxjVi1OLylKLdA31kooy0zNK chMzc3QNDcz0clOLixPTU3MSk4r1kvNzNzECg58BCHYw7nzudIhRkoNJSZTXQWNhpBBfUn5KZ UZicUZ8UWlOavEhRhkODiUJXn6TRZFCgkWp6akVaZk5wDiESUtw8CiJ8B4xBkrzFhck5hZnpk OkTjHac1y5su4LE8eG1euB5J2+DUByyoHtX5iEWPLy81KlxHlngkwVAGnLKM2DGwpLG5cYZaW EeRmBzhTiKUgtys0sQZV/xSjOwagkzBsOMoUnM68EbvcroLOYgM5SFFwIclZJIkJKqoGROSvm wq13iox/tm/O8/q/yHdNwfQf3j+WcSjxb3J0nzDx2Kfbni251xfc22So7fqtln3f7eSYYNs3i mWnlzOu3f3qKHeSmNq0DLlK12Onzkq+3Zt4dtKNyXHpqVbXP7bOC0uXv2z6IOb5l/iiIzstHl 3m+K0042q7lQqjsYjlayXry5czNj5kVGIpzkg01GIuKk4EADAEcGcWAwAA X-Env-Sender: rajiv.ranganath@atihita.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1503802875!81806699!1 X-Originating-IP: [209.85.192.173] 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 64875 invoked from network); 27 Aug 2017 03:01:16 -0000 Received: from mail-pf0-f173.google.com (HELO mail-pf0-f173.google.com) (209.85.192.173) by server-11.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 27 Aug 2017 03:01:16 -0000 Received: by mail-pf0-f173.google.com with SMTP id c15so6323394pfm.2 for ; Sat, 26 Aug 2017 20:01:16 -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=WDN49UeMILAG21rFTTjW61jvkz+OtYOTp5AJABUs/r0=; b=pPQ5+SDxsyYbh6y04FgGluVxeoLjQP28cGGj9iLGitwsajxDNvrLN/R1TW8gSl+CPo DH/0agsZsFd82sFT9Qk02yZvLkOg859dTt3azqBdcsQqgs8OMKuH/vpnX2C2TaRcofIp CFzw24CLMWbIRgc1WpFGDlohDvIRuTR3igbTwVchwxXCWTOb6ehdTjZ0p6ZYrkpuf9xf FWBUX3WUMTvyhTJIPSU3U6q910HwoAnbv+/rIofme60wrQ4dvr2DjdNaGrxKkjHzh3bb MLulA/jgR74nli017nNJ3szMYcZRNRGMZF9vQca4VR20D5kajcvd3Wt9CYp9hO2FH/e5 tzxw== 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=WDN49UeMILAG21rFTTjW61jvkz+OtYOTp5AJABUs/r0=; b=s8O27Og2UcPAhkhLJv5a/W8s8vUGKzT9VKD51LdpsxdGXlrelky/D3iV8Qlcj0lbRf iOY4NubY7WzjQR0ikyfNJHFm5DiIPl1w5cBq/OLIxevozSlLAc1eCtT+5GXryxhHfZtV ymr3ZPn1FWlzrSa6Yscdy0tnzHlrPwC2s5xZh/Wv1YsrbdlvFdu8fWVBL43Oe2/I9P+5 v9t+p/s56/KFmrdt+ZJ1nmhvl7sz3levOS/z5e4tpePeXobjujaEfg9wt+CeSh0xthbc AoRAo0X7Ry3ErPkhJ0UI9B9hO7KMF35TnUfzoUqijQZ99ugvRGGnArIo7pCKU8QwSC/I bkmw== X-Gm-Message-State: AHYfb5iHs9vZz731l9Yf/5NM5dvRSHtzcp3wMf4IOYwdz/Fty1IP2yGW 01qGjWKGWzQdzwqqlH+HDQ== X-Received: by 10.98.8.198 with SMTP id 67mr3319952pfi.87.1503802875033; Sat, 26 Aug 2017 20:01:15 -0700 (PDT) Received: from localhost ([103.205.218.127]) by smtp.gmail.com with ESMTPSA id f65sm16934146pfc.109.2017.08.26.20.01.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Aug 2017 20:01:13 -0700 (PDT) From: Rajiv Ranganath To: xen-devel@lists.xen.org Date: Sun, 27 Aug 2017 08:31:11 +0530 Message-Id: <20170827030110.40527.811.stgit@rajivs-macbook-pro.local> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170827030018.40527.88922.stgit@rajivs-macbook-pro.local> References: <20170827030018.40527.88922.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 v1 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 Signed-off-by: Rajiv Ranganath --- build/fedora/xen-unstable-runit/setup.sh | 18 ++++++++++++++++ build/fedora/xen-unstable-runit/teardown.sh | 18 ++++++++++++++++ .../xen-init-dom0-disk-backend/run | 11 ++++++++++ build/fedora/xen-unstable-runit/xen-init-dom0/run | 9 ++++++++ build/fedora/xen-unstable-runit/xenconsoled/run | 13 +++++++++++ build/fedora/xen-unstable-runit/xenstored/run | 23 ++++++++++++++++++++ 6 files changed, 92 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..b5adf8c --- /dev/null +++ b/build/fedora/xen-unstable-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-unstable-runit/$service /etc/service/$service +done + +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..d333807 --- /dev/null +++ b/build/fedora/xen-unstable-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-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..6315d48 --- /dev/null +++ b/build/fedora/xen-unstable-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-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..193ba19 --- /dev/null +++ b/build/fedora/xen-unstable-runit/xen-init-dom0/run @@ -0,0 +1,9 @@ +#!/bin/bash + +set -e + +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..b5b7a9f --- /dev/null +++ b/build/fedora/xen-unstable-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-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..beb2a5f --- /dev/null +++ b/build/fedora/xen-unstable-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-unstable/sbin/xenstored --no-fork