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 75D55516C; Thu, 04 Sep 2025 23:48:24 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 9E0184F6D; Thu, 04 Sep 2025 23:48:10 +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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-yb1-xb2d.google.com (mail-yb1-xb2d.google.com [IPv6:2607:f8b0:4864:20::b2d]) by atuin.qyliss.net (Postfix) with ESMTPS id 34C9D4DE2 for ; Thu, 04 Sep 2025 23:48:02 +0000 (UTC) Received: by mail-yb1-xb2d.google.com with SMTP id 3f1490d57ef6-e94d678e116so1781492276.2 for ; Thu, 04 Sep 2025 16:48:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757029681; x=1757634481; darn=spectrum-os.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=m0ZK9HoqHEtRUC4afb73x9za/s99UncYwPtnHN4kdHE=; b=K1AULi/Im8vWipRBzeG0C8XhtNb46Uf5wF1JfTv2KQCM8aRm8yE0oCFFEisXoaez5z 6fK995Kwmke6Q1ObV1csF12dDf9J1RclCNaiN/c4Q2KbMOx/q9PNmaA1UaD/NUUGrLIH BrDt6Z8Vh9n9EfK9BlBra5M9fmkU+eZCl28/p7HMBifhXus6FazmphhFhmX+BehUjNOQ UhoRvf62EGGAJ0mJBoaq2qqHilWVCUOEOnYJcO0SW0t0XtvJ0vwFzs3CBhEpzwAaIP/Q j4Z0bGhKkfYxJ3VHVmWoy2dG/xoDzVVBqZu+3MP1B9mjnfNw41UYjtdxAr9Owj4/4I1U 7l8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757029681; x=1757634481; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m0ZK9HoqHEtRUC4afb73x9za/s99UncYwPtnHN4kdHE=; b=G0gwgFtz7zEvy//EQ+OjSDvgCxXEjYWv72HWNhmBFgNfhmlmE10W7wY42xlXO6/dYg WXGnNlh6ScgB9j8/5jfkv7oW7hwsc49z0f/R5VRFQXIXwsLkfL9zlvZ4n4ROqayhxcy+ Xw4zY0T5gRjFbj3qfQxiaLj7J94uinjorZvn6PqU0L8B5NLV6Op4jMBbkrKeUhEaFRaL dOCTmwaCyxiAYQgc4IqEswJ6qOH2ErRME9WCPDYyMRTkDSDlI30nvUU0Qb5cQWSIvIft yPmvh+/lDZpA5n50RVWjvTIZFTALnnWNZ4wbztjqFIqr1VECfLY16dFGHhScchvzK3gw Lcew== X-Gm-Message-State: AOJu0YwbYVADu/rrdjBr6rL+x+mQbNufxWVrVLZTN7vW0bfJNQtnTsff 4Nh7sgCIjDK0k7gJlizHHJC+I4EjnuuB8HrZEPToxCwdUyOQ15Xzv7OP3R2/nFAf X-Gm-Gg: ASbGncsgFQnJef87JyDy+ZocIacqN3ynolAabGAFEeQrhvcibl/3Xu69iklRkcNDF5r M9PZBfdPuz25U4gzoOF5RLeW8TRZO6DqmcKC4K0ifKRWDGBmUC3uooq9yp7imWrJgZSVVYtTjho WHJ+Z04hPBAR/YwGlAoUmFbvF9cw30dZowMLlbRS5DHqkkYdnc3lkgHhAxruzG7i/W25hRFVvrI Nd0Oj4soAfqBktrJTNy4EkojAePxmRIJtNdkmFu1vnny+FJkSNn2Kmn9LrpK9m8C/VsgTB7Hz/t vKI0FGpo0t3Pla7BbBpIigkGdXhJtLpu4blJiSPy29IJjRnYXwCu6M662aIeZuXkC189afsNQu+ WbzbUIFkEweftLwcXyso3F5UkmST3Ew3wUFq7sH0+WtaM7k9L5grSqG8qvAyQLtFS4vpDOjsOLX 51UKOIqPxcXBVmEV8uO3lhXO6ciQN0rn1fmX2y3Mdg57U= X-Google-Smtp-Source: AGHT+IHKg5rgFxqoH4PC3Zg9OB3MrSngMYPuL6bOFyqUyirbZSk5k1EmAAUaeZ5furtfDYtqNH1VJQ== X-Received: by 2002:a05:690e:154c:10b0:609:d205:be04 with SMTP id 956f58d0204a3-609d205c16emr2678537d50.12.1757029680836; Thu, 04 Sep 2025 16:48:00 -0700 (PDT) Received: from localhost.localdomain (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with UTF8SMTPSA id 00721157ae682-723a85aac02sm25266117b3.73.2025.09.04.16.48.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Sep 2025 16:48:00 -0700 (PDT) From: Demi Marie Obenour Date: Thu, 04 Sep 2025 17:26:39 -0400 Subject: [PATCH 17/20] Use /etc/s6-rc/compiled for compiled s6-rc directory MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250904-systemd-v1-17-2a63b790a913@gmail.com> References: <20250904-systemd-v1-0-2a63b790a913@gmail.com> In-Reply-To: <20250904-systemd-v1-0-2a63b790a913@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1757021182; l=4626; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=uRfaP6OeK/jrR7SKBdv7c/8mLFLOT3FeCQx0g8K0dnY=; b=RzQEoKo7Qt4ja7DRhCrdR0qk2lBA+IOx+f45KMPnoVOVjNxbXpOfT2edgCHS0HoIQjElqcafd Ygsvej4vXHVDwS6rXH2RgJZ9kI8qXsZ0vnqwwEsnJvSMrYnUNs92ofc X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: N3M3FK4MATIP33FXAYDKTK3Y2GCKQFLS X-Message-ID-Hash: N3M3FK4MATIP33FXAYDKTK3Y2GCKQFLS X-MailFrom: demiobenour@gmail.com 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: Demi Marie Obenour , Alyssa Ross 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: 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 --- 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..c62f585b8b7b57918b71fbf4afc18c91965bc1f1 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -105,7 +105,7 @@ LINKS = \ etc/s6-linux-init/run-image/opengl-driver \ etc/s6-linux-init/run-image/service/vmm/template/run -BUILD_FILES = build/etc/s6-rc +BUILD_FILES = build/etc/s6-rc/compiled $(dest): ../../scripts/make-erofs.sh $(PACKAGES_FILE) $(FILES) $(BUILD_FILES) build/empty build/fifo ( \ @@ -160,7 +160,7 @@ S6_RC_FILES = \ # 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 $@ diff --git a/host/rootfs/etc/s6-linux-init/scripts/rc.init b/host/rootfs/etc/s6-linux-init/scripts/rc.init index 674fd38cc76837c7be25a5ef060f0f4d4b786394..b06a4ab7518f0af204475c41ee77ea5f8d657718 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 -if { s6-rc-init -c /etc/s6-rc /run/service } +if { s6-rc-init /run/service } if { mount --make-shared /run } if { mount -a --mkdir } diff --git a/img/app/Makefile b/img/app/Makefile index d3c206d70eedc2b423944ecff5f7c723ba719e0d..da70c65cdcde69ae39a543b396e3c566d9e49943 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -68,7 +68,7 @@ VM_FIFOS = etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/fifo # them as make dependencies would confuse make. VM_LINKS = etc/ssl/certs/ca-certificates.crt -VM_BUILD_FILES = build/etc/s6-rc +VM_BUILD_FILES = build/etc/s6-rc/compiled build/fifo: mkdir -p build @@ -114,7 +114,7 @@ VM_S6_RC_FILES = \ etc/s6-rc/wireplumber/run \ etc/s6-rc/wireplumber/type -build/etc/s6-rc: $(VM_S6_RC_FILES) +build/etc/s6-rc/compiled: $(VM_S6_RC_FILES) mkdir -p $$(dirname $@) rm -rf $@ diff --git a/img/app/etc/s6-linux-init/scripts/rc.init b/img/app/etc/s6-linux-init/scripts/rc.init index 0bf350a7015b01072c1fe8dab6be2fb51fa71d5a..e4932e4ad478db7c51ab8c63ccb601d7a60efb85 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 } -if { s6-rc-init -c /etc/s6-rc /run/service } +if { s6-rc-init /run/service } if { modprobe overlay } if { mount -a --mkdir } diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index a5ba5bbe219c3a37ba887a360cea61b3dc8eedce..b94d27d193e419291c72832f4a351c4ff099c33e 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -42,7 +42,7 @@ VM_FILES = \ etc/sysctl.conf VM_DIRS = etc/s6-linux-init/env var/lib/connman -VM_BUILD_FILES = build/etc/s6-rc +VM_BUILD_FILES = build/etc/s6-rc/compiled build/empty: mkdir -p $@ @@ -75,7 +75,7 @@ VM_S6_RC_FILES = \ etc/s6-rc/sysctl/type \ etc/s6-rc/sysctl/up -build/etc/s6-rc: $(VM_S6_RC_FILES) +build/etc/s6-rc/compiled: $(VM_S6_RC_FILES) mkdir -p $$(dirname $@) rm -rf $@ diff --git a/vm/sys/net/etc/s6-linux-init/scripts/rc.init b/vm/sys/net/etc/s6-linux-init/scripts/rc.init index eaf037ec123afcaeafced93096c4f35c2388f385..bcb65cb3039cf9dcfde726ffdd4126c00c0e5641 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 } -if { s6-rc-init -c /etc/s6-rc /run/service } +if { s6-rc-init /run/service } if { mkdir -p /dev/pts /dev/shm } if { mount -a } -- 2.51.0