From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 8D28B90271; Mon, 10 Oct 2022 23:32:38 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id CF2389016F; Mon, 10 Oct 2022 23:32:25 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 51C4890076 for ; Mon, 10 Oct 2022 23:32:13 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 31FCB5C01B0 for ; Mon, 10 Oct 2022 19:32:09 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 10 Oct 2022 19:32:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1665444729; x=1665531129; bh=5q IeSx0mcZAlLLXfa9rRvJzfGqk3YjZ+ZEhRymhmV1o=; b=pcWi25ZkhNu8rNsct/ CmLhu80ZTmpo2nmbVlK+dmh3LfEdXQf3BRhijWEVtkFaEJKADE4FdVcSHPKdMCGu /EclQTRB2Lh53lxTNC7sp/aACcemBRjpOGh1IZEIOPsU3DlGS4ATplW1CqNEH/yr lchVgPwWwcaoaYIVFMEkmdybdzG1k/XOXEF9q7LuWQ5MKylDaDB2IMFCkJf3km0e 9l+WB875Ef65PI8rbXs+HlpNuoTT/wSXS3eVzKo96QKyMwJ3tMDekiQ4CmJ1c7K6 tPdrEmRfqVmOpvBNsOWCKUrtSLSkQ2tgU6MmlKvdRxaknThmxg9P9JO2ugCoi1Qm H2rg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1665444729; x=1665531129; bh=5qIeSx0mcZAlL LXfa9rRvJzfGqk3YjZ+ZEhRymhmV1o=; b=PL/oc6FYkMArrMML8/qjK7qu1Zhql pc3PnBLU1lAIVv+vFn1Vub+U5OLHqEOfnp7G/On3I223kGvUBMNdTAhpxo708n/D pcH2B/5hayk92dbBzDlGau47KpBtXIu5vKi/G36Fk0+Z5m7yB+T017OFHQ5PEKUf fuL38utGttu/N54ZXBc0A4jcA/rFD9xjNvJHW2zRHuwuiqg0R+Nv/yh0FFxW4Nkv 39Jc0K+uvIW+t6mrVm+gRNwGZekT1wb5+QDILv0FqUF431nh/yg+9q4cVhFJLUWp S94bxhIT5jPzaSgwcjBS4hCCUb01lnmAfQsoETPUfMTlGXfw8J5o3gmcA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeejhedgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepgfefudekvdelieelledufeevheeglefggedvudejvd dtffeuueevffehleejkedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepqhihlhhishhsseigvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 10 Oct 2022 19:32:08 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 84C8CB6B; Mon, 10 Oct 2022 23:32:06 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 11/22] host/rootfs: move ext mounting to s6-rc service Date: Mon, 10 Oct 2022 23:28:51 +0000 Message-Id: <20221010232909.1953738-12-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221010232909.1953738-1-hi@alyssa.is> References: <20221010232909.1953738-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: GNOFDOTTZ4Q2PQFHEW2MFDEUQ62OHNNX X-Message-ID-Hash: GNOFDOTTZ4Q2PQFHEW2MFDEUQ62OHNNX X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Broadly, it makes sense to do things in s6-rc rather than mdev commands where possible, since mdev commands are not run in parallel. That's unlikely to make a big difference in this case, but we might want to do more things before mounting as well (e.g. growing the filesystem) and I think it makes sense to do that here. Signed-off-by: Alyssa Ross --- host/rootfs/etc/mdev/block/add | 1 - host/rootfs/etc/s6-rc/ext/up | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/host/rootfs/etc/mdev/block/add b/host/rootfs/etc/mdev/block/add index 75e0c31..3e24355 100755 --- a/host/rootfs/etc/mdev/block/add +++ b/host/rootfs/etc/mdev/block/add @@ -35,5 +35,4 @@ if { } if { ln -s $devname ext } -if { mount ext /ext } /etc/mdev/listen ext diff --git a/host/rootfs/etc/s6-rc/ext/up b/host/rootfs/etc/s6-rc/ext/up index d9e0426..4e0b9fc 100644 --- a/host/rootfs/etc/s6-rc/ext/up +++ b/host/rootfs/etc/s6-rc/ext/up @@ -1,4 +1,5 @@ # SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross -/etc/mdev/wait ext +if { /etc/mdev/wait ext } +mount /dev/ext /ext -- 2.37.1