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 A592C1E482; Thu, 13 Nov 2025 11:10:56 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 764501E3F8; Thu, 13 Nov 2025 11:10:53 +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_MISSING,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fhigh-b6-smtp.messagingengine.com (fhigh-b6-smtp.messagingengine.com [202.12.124.157]) by atuin.qyliss.net (Postfix) with ESMTPS id 5D4021E3ED for ; Thu, 13 Nov 2025 11:10:51 +0000 (UTC) Received: from phl-compute-04.internal (phl-compute-04.internal [10.202.2.44]) by mailfhigh.stl.internal (Postfix) with ESMTP id 114057A01B4 for ; Thu, 13 Nov 2025 06:10:48 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Thu, 13 Nov 2025 06:10:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm2; t=1763032247; x=1763118647; bh=19WaR51eIyEjkb/1kuJ1K r9RkpiCUN17gUX5kBFQHHg=; b=eyE+IuZHmNWyOI85kuFwbWLRnokV8KZ2JDnNU t7fAYDpu5EpdjQUxkd5QZTO97WC/v4OwFJ074podHEZRw9EEDgBwOYTO+IoFpRSV jZbqYdEGkaSRy5EXme7VvLH8qlDUac51863F17XO+cTHLA3QJE5FXjRM4cY4J6Ot 1NYjP0XKohL/5F+tU7jkKkq96oOTa9q4i3jSAFthcPnhgBNG/yaMJ8GdiFz69nQr poOEViEinHGClG/beC19tIJ+ynp5oWuAU1q5zZ3HW0hzR5QfT8enXsgmg+MyOyMY w4JOyOE0OCpOSqgGSj5nHNw++xz4XWqmr8uOFxISAz5PjZakA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1763032247; x=1763118647; bh=19WaR51eIyEjkb/1kuJ1Kr9RkpiCUN17gUX 5kBFQHHg=; b=lXwoadkr9AvMIzRm4M8h/X8StOAGaATDb+713BmKRVE0i5ZPinO iV1aWX1o9YnQe0fpAMysPbzrAG2sQtmfcR7d2pIODy1tRPfZm1BfJIofUwrPgUGi 0YoxDgHTgFBQjEbX0oAo4fomJhWgQA2iGA+20osCg3j82cT3gaub0vccBnQEKFD5 fASTrcUC1Nck0/7lCVJD43vz5DygfeF16XS3NBLh9Pnr+ekyB6WswylY96Gh43N/ +eMNo0ToaSv/sQJQfJuBmQfrDHSBcAKhOiIGrkzTk6XCtznTBlGKJQZDbratWSUr LQDQfgxJPOR20NItxIQkI4MjqqpcDTuYG3w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggddvtdeijeelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtredttd enucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhisheqnecu ggftrfgrthhtvghrnheptdekffelfeetffdvveetgeehhfeiudduteffueevhfekudekfe evudefkeeuveefnecuffhomhgrihhnpehshhhuthguohifnhdrfhhinhgrlhenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhihesrghlhihssh grrdhishdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepuggvvhgvlhesshhpvggtthhruhhmqdhoshdrohhrgh X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 13 Nov 2025 06:10:47 -0500 (EST) Received: by fw12.qyliss.net (Postfix, from userid 1000) id 38313139B881; Thu, 13 Nov 2025 12:10:46 +0100 (CET) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 1/3] img/app: move init to /usr/bin Date: Thu, 13 Nov 2025 12:10:36 +0100 Message-ID: <20251113111038.39098-1-hi@alyssa.is> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: NARO2IKS5Q3TPCW5WBHF4POVZN4EWGWC X-Message-ID-Hash: NARO2IKS5Q3TPCW5WBHF4POVZN4EWGWC 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 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: /sbin/init (which for us is /usr/bin/init via the /sbin symlink) is the highest precedence path for init in the kernel. If we keep our init at /etc/init, installing a package (like systemd) that provides its own init will quietly take precedence over our own. Let's claim this path for ourselves, so adding init from a package will fail loudly. Signed-off-by: Alyssa Ross --- img/app/file-list.mk | 4 ++-- img/app/image/{etc => usr/bin}/init | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename img/app/image/{etc => usr/bin}/init (100%) diff --git a/img/app/file-list.mk b/img/app/file-list.mk index 506ab7a..0b4d3d1 100644 --- a/img/app/file-list.mk +++ b/img/app/file-list.mk @@ -4,7 +4,6 @@ FILES = \ image/etc/dbus-1/session.conf \ image/etc/fstab \ - image/etc/init \ image/etc/mdev.conf \ image/etc/mdev/iface \ image/etc/mdev/listen \ @@ -26,7 +25,8 @@ FILES = \ image/etc/s6-linux-init/scripts/rc.shutdown \ image/etc/s6-linux-init/scripts/rc.shutdown.final \ image/etc/wireplumber/wireplumber.conf.d/99_spectrum.conf \ - image/etc/xdg/xdg-desktop-portal/portals.conf + image/etc/xdg/xdg-desktop-portal/portals.conf \ + image/usr/bin/init LINKS = \ image/bin \ diff --git a/img/app/image/etc/init b/img/app/image/usr/bin/init similarity index 100% rename from img/app/image/etc/init rename to img/app/image/usr/bin/init base-commit: 651da813154329e8398a23dbaabdeef633c1f2a6 -- 2.51.0