From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 652DB19E0A; Mon, 08 Sep 2025 09:27:08 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 16D5619D9B; Mon, 08 Sep 2025 09:27:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_MISSING,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fout-b5-smtp.messagingengine.com (fout-b5-smtp.messagingengine.com [202.12.124.148]) by atuin.qyliss.net (Postfix) with ESMTPS id 48E8F19D99 for ; Mon, 08 Sep 2025 09:27:05 +0000 (UTC) Received: from phl-compute-10.internal (phl-compute-10.internal [10.202.2.50]) by mailfout.stl.internal (Postfix) with ESMTP id 3D8471D00085; Mon, 8 Sep 2025 05:27:04 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Mon, 08 Sep 2025 05:27:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1757323624; x=1757410024; bh=xdyigpbbEv Y7ekOMBj3Xn0tcD/+EuiSDPANY14giJ60=; b=KZbOBkZGh5QBjahG0sKLtjb0MC GhkrQ49FGDBre4f39IBtP8HpXtjqury265d5t0N4IZVu8Qko/bdS0WHtHr6UR5b/ 6DzEUCABRjrDaBRZEWpSSpjX1SEXOZH0PjtXgrvwScXZz+haJPz0aA0PKCZuVkFD q70jZmqKXsLMs/oyX5pIViOfuw1AYj83yTfsPh0jPJW4JfNADmrpgPEt6cMa/Kl2 MWiUORPmJcxLGgr52d8T7SMa1hKcvWGfP9QfcOx07BolqKI0Rmzjujw05rLBptTL QB/e0aoDtelDU4D7Kv07d9AdsQjC1PZK3cnnrabbC3ghH1QMlw6aJYl7/iTQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1757323624; x=1757410024; bh=xdyigpbbEvY7ekOMBj3Xn0tcD/+EuiSDPAN Y14giJ60=; b=XmSO21DPYKVck7Z8ufJWxpexcr1IwvQXHTjGFogNT8pAbD90Acf CG3ALFoTTWq78TBq2sXW5sopm/Ds+elN6iao8FSblQOe3DFUY8qDwiA9ieIdFew8 Iy2ymlXh7YeMsHpccChuDPoqgTHAxo7MDb+D5sBXx5RRb47xFMycf6sJaZalv+Nj akB3VxctskeMbarijGweCuUlfYmKs+22v3kh7M+ZR1gz6XOi7HOo7LaGJ3HeFajF J4kfq3GmiSY0+IIs9z/0V58brqArDTf/0+iL232GzP0PGb+b/o9QVu+If5M2paBq Y6uwCltM7/cI1pINWcrR8TnlfZQWac+zaGA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggddujeduiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufgjfhffkfggtgesghdtreertddttdenucfhrhhomheptehlhihsshgrucft ohhsshcuoehhihesrghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnhepieduffeuie elgfetgfdttddtkeekheekgfehkedufeevteegfeeiffetvdetueevnecuvehluhhsthgv rhfuihiivgepvdenucfrrghrrghmpehmrghilhhfrhhomhephhhisegrlhihshhsrgdrih hspdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopegu vghmihhosggvnhhouhhrsehgmhgrihhlrdgtohhmpdhrtghpthhtohepuggvvhgvlhessh hpvggtthhruhhmqdhoshdrohhrgh X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 8 Sep 2025 05:27:03 -0400 (EDT) Received: by mbp.qyliss.net (Postfix, from userid 1000) id 243C716750E7; Mon, 08 Sep 2025 11:27:02 +0200 (CEST) From: Alyssa Ross To: Demi Marie Obenour Subject: Re: [PATCH 17/20] Use /etc/s6-rc/compiled for compiled s6-rc directory In-Reply-To: <20250904-systemd-v1-17-2a63b790a913@gmail.com> References: <20250904-systemd-v1-0-2a63b790a913@gmail.com> <20250904-systemd-v1-17-2a63b790a913@gmail.com> Date: Mon, 08 Sep 2025 11:27:01 +0200 Message-ID: <87348xjnve.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Message-ID-Hash: YJPVE26HN3CRCDLHXQBKDE3GVXFQPNCA X-Message-ID-Hash: YJPVE26HN3CRCDLHXQBKDE3GVXFQPNCA X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Spectrum OS Development X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Demi Marie Obenour writes: > This is the default, so it makes things simpler and avoids having to > specify "-c /etc/s6-rc" in every s6-rc-init invocation. > > Signed-off-by: Demi Marie Obenour It is the default, but I'm not sure it's a default that makes sense for Spectrum, where the source files are not part of the filesystem. There will never be anything else under /etc/s6-rc. There shouldn't really be much reason to run s6-rc-init interactively, so I don't think there's much value in avoiding having to specify -c. > --- > host/rootfs/Makefile | 4 ++-- > host/rootfs/etc/s6-linux-init/scripts/rc.init | 2 +- > img/app/Makefile | 4 ++-- > img/app/etc/s6-linux-init/scripts/rc.init | 2 +- > vm/sys/net/Makefile | 4 ++-- > vm/sys/net/etc/s6-linux-init/scripts/rc.init | 2 +- > 6 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile > index 4faaccab8cb01d57ef7c48c01eb6fb1326cea4a0..c62f585b8b7b57918b71fbf4a= fc18c91965bc1f1 100644 > --- a/host/rootfs/Makefile > +++ b/host/rootfs/Makefile > @@ -105,7 +105,7 @@ LINKS =3D \ > etc/s6-linux-init/run-image/opengl-driver \ > etc/s6-linux-init/run-image/service/vmm/template/run >=20=20 > -BUILD_FILES =3D build/etc/s6-rc > +BUILD_FILES =3D build/etc/s6-rc/compiled >=20=20 > $(dest): ../../scripts/make-erofs.sh $(PACKAGES_FILE) $(FILES) $(BUILD_F= ILES) build/empty build/fifo > ( \ > @@ -160,7 +160,7 @@ S6_RC_FILES =3D \ > # including files that aren't intended to be part of the input, like > # temporary editor files or .license files. So for all these reasons, > # only explicitly listed files are made available to s6-rc-compile. > -build/etc/s6-rc: $(S6_RC_FILES) > +build/etc/s6-rc/compiled: $(S6_RC_FILES) > mkdir -p $$(dirname $@) > rm -rf $@ >=20=20 > diff --git a/host/rootfs/etc/s6-linux-init/scripts/rc.init b/host/rootfs/= etc/s6-linux-init/scripts/rc.init > index 674fd38cc76837c7be25a5ef060f0f4d4b786394..b06a4ab7518f0af204475c41e= e77ea5f8d657718 100755 > --- a/host/rootfs/etc/s6-linux-init/scripts/rc.init > +++ b/host/rootfs/etc/s6-linux-init/scripts/rc.init > @@ -2,7 +2,7 @@ > # SPDX-License-Identifier: EUPL-1.2+ > # SPDX-FileCopyrightText: 2020-2022, 2024 Alyssa Ross >=20=20 > -if { s6-rc-init -c /etc/s6-rc /run/service } > +if { s6-rc-init /run/service } >=20=20 > if { mount --make-shared /run } > if { mount -a --mkdir } > diff --git a/img/app/Makefile b/img/app/Makefile > index d3c206d70eedc2b423944ecff5f7c723ba719e0d..da70c65cdcde69ae39a543b39= 6e3c566d9e49943 100644 > --- a/img/app/Makefile > +++ b/img/app/Makefile > @@ -68,7 +68,7 @@ VM_FIFOS =3D etc/s6-linux-init/run-image/service/s6-lin= ux-init-shutdownd/fifo > # them as make dependencies would confuse make. > VM_LINKS =3D etc/ssl/certs/ca-certificates.crt >=20=20 > -VM_BUILD_FILES =3D build/etc/s6-rc > +VM_BUILD_FILES =3D build/etc/s6-rc/compiled >=20=20 > build/fifo: > mkdir -p build > @@ -114,7 +114,7 @@ VM_S6_RC_FILES =3D \ > etc/s6-rc/wireplumber/run \ > etc/s6-rc/wireplumber/type >=20=20 > -build/etc/s6-rc: $(VM_S6_RC_FILES) > +build/etc/s6-rc/compiled: $(VM_S6_RC_FILES) > mkdir -p $$(dirname $@) > rm -rf $@ >=20=20 > diff --git a/img/app/etc/s6-linux-init/scripts/rc.init b/img/app/etc/s6-l= inux-init/scripts/rc.init > index 0bf350a7015b01072c1fe8dab6be2fb51fa71d5a..e4932e4ad478db7c51ab8c63c= cb601d7a60efb85 100755 > --- a/img/app/etc/s6-linux-init/scripts/rc.init > +++ b/img/app/etc/s6-linux-init/scripts/rc.init > @@ -8,7 +8,7 @@ if { ln -s /proc/self/fd/0 /dev/stdin } > if { ln -s /proc/self/fd/1 /dev/stdout } > if { ln -s /proc/self/fd/2 /dev/stderr } >=20=20 > -if { s6-rc-init -c /etc/s6-rc /run/service } > +if { s6-rc-init /run/service } >=20=20 > if { modprobe overlay } > if { mount -a --mkdir } > diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile > index a5ba5bbe219c3a37ba887a360cea61b3dc8eedce..b94d27d193e419291c72832f4= a351c4ff099c33e 100644 > --- a/vm/sys/net/Makefile > +++ b/vm/sys/net/Makefile > @@ -42,7 +42,7 @@ VM_FILES =3D \ > etc/sysctl.conf > VM_DIRS =3D etc/s6-linux-init/env var/lib/connman >=20=20 > -VM_BUILD_FILES =3D build/etc/s6-rc > +VM_BUILD_FILES =3D build/etc/s6-rc/compiled >=20=20 > build/empty: > mkdir -p $@ > @@ -75,7 +75,7 @@ VM_S6_RC_FILES =3D \ > etc/s6-rc/sysctl/type \ > etc/s6-rc/sysctl/up >=20=20 > -build/etc/s6-rc: $(VM_S6_RC_FILES) > +build/etc/s6-rc/compiled: $(VM_S6_RC_FILES) > mkdir -p $$(dirname $@) > rm -rf $@ >=20=20 > diff --git a/vm/sys/net/etc/s6-linux-init/scripts/rc.init b/vm/sys/net/et= c/s6-linux-init/scripts/rc.init > index eaf037ec123afcaeafced93096c4f35c2388f385..bcb65cb3039cf9dcfde726ffd= d4126c00c0e5641 100755 > --- a/vm/sys/net/etc/s6-linux-init/scripts/rc.init > +++ b/vm/sys/net/etc/s6-linux-init/scripts/rc.init > @@ -7,7 +7,7 @@ if { ln -s /proc/self/fd/0 /dev/stdin } > if { ln -s /proc/self/fd/1 /dev/stdout } > if { ln -s /proc/self/fd/2 /dev/stderr } >=20=20 > -if { s6-rc-init -c /etc/s6-rc /run/service } > +if { s6-rc-init /run/service } >=20=20 > if { mkdir -p /dev/pts /dev/shm } > if { mount -a } > > --=20 > 2.51.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRV/neXydHjZma5XLJbRZGEIw/wogUCaL6hZQAKCRBbRZGEIw/w ot2WAP9XJQv5nclrwLYiL7QJcjQdCbDqVGP+B6III/Z2NJZ3oQEA3XAuK1E4Op+Z wDRz5+n6V1Qaw5taxq1DfJ2pw5k6LQk= =ag81 -----END PGP SIGNATURE----- --=-=-=--