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 182BA10CF; Tue, 25 Nov 2025 07:36:37 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 1DB90105D; Tue, 25 Nov 2025 07:36:34 +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 fhigh-a7-smtp.messagingengine.com (fhigh-a7-smtp.messagingengine.com [103.168.172.158]) by atuin.qyliss.net (Postfix) with ESMTPS id 9702C105B for ; Tue, 25 Nov 2025 07:36:31 +0000 (UTC) Received: from phl-compute-02.internal (phl-compute-02.internal [10.202.2.42]) by mailfhigh.phl.internal (Postfix) with ESMTP id 27B77140016A; Tue, 25 Nov 2025 02:36:29 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-02.internal (MEProxy); Tue, 25 Nov 2025 02:36:29 -0500 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=fm2; t=1764056189; x=1764142589; bh=ie0rHIee1I sNPD3HR8bHRK8RUXdicLPUbr+VTTvbFXk=; b=m2zPIfD1AxirjuP4yRL5YjaqTl o5NChyAzjJVKh7v86yt2YMULaRlhJrV6IFfB9gu532GznLizqG1V/95jFEfolOJQ +MGC5vCAyoCddZQs3JBmglCHpnetISKp06Gle2wbvv46QeGJSo2cLUM0yRLq42nU 5BKuCLK9pCN6e/mFLxTV10cRZR0U7hzF21toArsh0Oe7wWuIlIPdck7QI+Vk3rp/ KVAUrGs+AFZInrcNmNJGaRTYfWgvKATf+8+d8wf9JmEKxaVLCcsLvSH0V4/ihVDE /yEeOHLZo24c+7q0pl5zKXzG9Xl5DjYsXlYV3JT2yRBNAIrvueCBiM1k5/ow== 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=fm3; t= 1764056189; x=1764142589; bh=ie0rHIee1IsNPD3HR8bHRK8RUXdicLPUbr+ VTTvbFXk=; b=MpAyzHP8n/n5uXP3fT83KlCYhK/QylrfyBjO7M1V6RiTqua1Hml EIbwpFfSz7vr2bBBonMhxt2qKgC8REPPhO5UVRVj7LxuDsoeKBLyKsqCuOldYT14 52zWYKaJ7vUzdo1cJI4rQcz/8d0X5elmr0GMDCn9eKu0fotoNNP10tq4TzOShBRD y4zh3GnwfUr1iQEsmpMImB3z9KyDj4GkHj/nDnwkUkyATI3VUlOtRZYM/wNgDOF0 tpp9+PvekFbG9/zStk7ZYErSWO6n/wp/j4kLOWR1UH64fobfIC1WSXn2EPigxw/J uqKzGPcH4vo3r+j0QJfGzkkgR9JxWI/ezKA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggddvgedtkeelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephffvvefujghffffkgggtsehgtderredttddtnecuhfhrohhmpeetlhihshhsrgcu tfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpeehhfdtff euteeiffekjefggeegteekudeifeejueeiffdttdefvdfgveehtedukeenucffohhmrghi nhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhephhhisegrlhihshhsrgdrihhspdhnsggprhgtphhtthhopedvpdhm ohguvgepshhmthhpohhuthdprhgtphhtthhopeguvghmihhosggvnhhouhhrsehgmhgrih hlrdgtohhmpdhrtghpthhtohepuggvvhgvlhesshhpvggtthhruhhmqdhoshdrohhrgh X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 25 Nov 2025 02:36:28 -0500 (EST) Received: by mbp.qyliss.net (Postfix, from userid 1000) id 45FC66AE246E; Tue, 25 Nov 2025 08:36:25 +0100 (CET) From: Alyssa Ross To: Demi Marie Obenour Subject: Re: [PATCH v4 02/14] host/rootfs: Install systemd-pull In-Reply-To: <20251121-updates-v4-2-d4561c42776e@gmail.com> References: <20251121-updates-v4-0-d4561c42776e@gmail.com> <20251121-updates-v4-2-d4561c42776e@gmail.com> Date: Tue, 25 Nov 2025 08:36:23 +0100 Message-ID: <87see2wolk.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Message-ID-Hash: 3MCUFF464VWUDKYQ4KMTEYMF4XTY3FRI X-Message-ID-Hash: 3MCUFF464VWUDKYQ4KMTEYMF4XTY3FRI 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 Demi Marie Obenour writes: > Due to a systemd bug [1], building systemd-sysupdate does not require > that systemd-pull is built as well. However, systemd-sysupdate has a > run-time dependency on systemd-pull. Therefore, override the systemd > derivation so that systemd-pull is built. Confusingly, this requires > enabling systemd-importd. > > If systemd-pull or systemd-sysupdate is not built, the resulting image > will be broken and users will not be able to recover without either a > reinstall or reverting to the previous version. Therefore, add a check > to ensure that both are in fact built. Use 'cat' rather than just > 'stat' to catch broken symlinks and the like. > > The override can be removed once > https://github.com/NixOS/nixpkgs/pull/461277 is merged, which builds > systemd-importd by default on musl. The tests will be preserved to > catch any regressions. > > [1]: https://github.com/systemd/systemd/issues/39635 > > Signed-off-by: Demi Marie Obenour > --- > Changes since v2: > > - Add link to upstream Nixpkgs issue. > --- > host/rootfs/default.nix | 24 ++++++++++++++++++++++-- > 1 file changed, 22 insertions(+), 2 deletions(-) We now have the Nixpkgs fix. Given that there's also an upstream fix in systemd, I don't think this is likely to regress, so my plan is to just skip this patch. (Hopefully we end up with an integration test for updates, which would catch this anyway.) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQQGoGac7QfI+H5ZtFCZddwkt31pFQUCaSVceAAKCRCZddwkt31p FccSAP9qqxLspHl9gfVwofWcB9E1cCLRZDfO4hcH+gg6V5mliQD7B0wH4ze2DALq k9LTZRzj2F+rAYVJMXKpacjlak2WlgA= =xge3 -----END PGP SIGNATURE----- --=-=-=--