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 CBE77252F6; Fri, 14 Nov 2025 11:59:33 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 38258252EB; Fri, 14 Nov 2025 11:59:31 +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 7D92C252EA for ; Fri, 14 Nov 2025 11:59:29 +0000 (UTC) Received: from phl-compute-11.internal (phl-compute-11.internal [10.202.2.51]) by mailfout.stl.internal (Postfix) with ESMTP id 2BADF1D0018B; Fri, 14 Nov 2025 06:59:28 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Fri, 14 Nov 2025 06:59:28 -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=1763121568; x=1763207968; bh=hm7VS+pzGM gYu+/LjE5TT6mTl/+8CUV9v33RTfgToeM=; b=LnCABQ9/riFwj5rPQu/bUxlU+Z YpNFF5NnR6n/hqiOKCb4ct5RNJh45YM3S3qBakdgeqoje8h9maxucO4LZHDMuPVU rI4cxR9YYAytzKr6WGvWqD5Hh8iYfW8dPciEJhLTsQooO0cFIqn8cGv/l/+r3Bse c15TzedlE/RD0PirWUw8Uyd2vqSXQnzk5g75bnbPNaR88UJMVJSFI/Y1kVEQS6Ks V0hY9q8cYDKF9ZpGxVOMKCbzT0cy3Pc2tAycbhXh62aIe4YhnbLagsiDwg/uJNma 7UsXPPknBNFG2kbQr7v4kqZsltvWMCfXqdnZKeXVwfXhc7srl7+0MhwxC1HQ== 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= 1763121568; x=1763207968; bh=hm7VS+pzGMgYu+/LjE5TT6mTl/+8CUV9v33 RTfgToeM=; b=s7uA2ZtBj3TalcOu/P2hIzG6XkIMHVRBNa1veKZjx+xONVNiUcu ir5T9/nyN2pnYDzEcmaTDDJsHyfblRRv1VOb/dn6ZdAssNz1ta8kvsknYSqZT+EQ Q821hZI2MLikUSJZj92wHz+C8PCILdg0arzi9Yy33FGgcuvc7fPLTOk6Lo2P8ToM gJo80qw984YKICn+DjQPy4jHHKpwqo/jmtdVoaL2I0OSKohQ6qKK0/Qhs0YIY0TC yFE4D78RS+e9xHmFtgX1JOLdQschBV4bb5c8JSU4picmIqTHGtDs+F2DctdKw3AS 74ujTOz0KkxwyYhRWMsuTM19i+ILaSAMdSg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggddvtdeljeeiucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephffvvefujghffffkgggtsehgtderredttddtnecuhfhrohhmpeetlhihshhsrgcu tfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpeeghfejtd ektdeulefhvdeggeehudfgudfghedttdfhkedtueeiveethfehfeefleenucffohhmrghi nhepvhhugihurdhorhhgpdhgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhihesrghlhihsshgrrdhishdpnhgspghr tghpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepuggvmhhiohgsvg hnohhurhesghhmrghilhdrtghomhdprhgtphhtthhopeguvghvvghlsehsphgvtghtrhhu mhdqohhsrdhorhhg X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 14 Nov 2025 06:59:27 -0500 (EST) Received: by fw12.qyliss.net (Postfix, from userid 1000) id DD91819CE29A; Fri, 14 Nov 2025 12:59:26 +0100 (CET) From: Alyssa Ross To: Demi Marie Obenour Subject: Re: [PATCH v2 2/8] host/rootfs: Install systemd-pull In-Reply-To: <3827fe2e-1017-423c-a3c3-3fdd3c3721fb@gmail.com> References: <20251112-updates-v2-0-88d96bf81b79@gmail.com> <20251112-updates-v2-2-88d96bf81b79@gmail.com> <87o6p69cu3.fsf@alyssa.is> <3827fe2e-1017-423c-a3c3-3fdd3c3721fb@gmail.com> Date: Fri, 14 Nov 2025 12:59:24 +0100 Message-ID: <87a50olt9f.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Message-ID-Hash: E5RRLQ75RKTON5EXD2A4JWT4Q45KLXL7 X-Message-ID-Hash: E5RRLQ75RKTON5EXD2A4JWT4Q45KLXL7 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: > On 11/13/25 10:22, Alyssa Ross wrote: >> Demi Marie Obenour writes: >>=20 >>> 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. >>> >>> Signed-off-by: Demi Marie Obenour >>> --- >>> host/rootfs/default.nix | 23 +++++++++++++++++++++-- >>> 1 file changed, 21 insertions(+), 2 deletions(-) >>> >>> diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix >>> index aea2e46bb5998176eb6d9b8aef802ae270fdd28c..c2045ad96cca37a1bf1a7b8= 2aa35a583cc5aee93 100644 >>> --- a/host/rootfs/default.nix >>> +++ b/host/rootfs/default.nix >>> @@ -43,7 +43,8 @@ let >>> }) >>>=20=20 >>> # Take kmod from pkgsGui since we use pkgsGui.kmod.lib below anyway. >>> - ] ++ (with pkgsGui; [ cosmic-files crosvm foot fuse3 kmod systemd ]); >>> + ] ++ (with pkgsGui; [ cosmic-files crosvm foot fuse3 kmod ]); >>> + >>>=20=20 >>> nixosAllHardware =3D nixos ({ modulesPath, ... }: { >>> imports =3D [ (modulesPath + "/profiles/all-hardware.nix") ]; >>> @@ -64,7 +65,15 @@ let >>> # https://inbox.vuxu.org/musl/20251017-dlopen-use-rpath-of-caller-ds= o-v1-1-46c69eda1473@iscas.ac.cn/ >>> usrPackages =3D [ >>> appvm kernel.modules firmware netvm >>> - ] ++ (with pkgsGui; [ dejavu_fonts kmod.lib mesa westonLite ]); >>> + ] ++ (with pkgsGui; [ >>> + dejavu_fonts kmod.lib mesa westonLite >>> + # Work around NixOS/nixpkgs#459020: without "withImportd =3D true" >>> + # systemd-pull doesn't get built, so systemd-sysupdate doesn't wor= k. >>> + (systemd.override { >>> + withImportd =3D true; >>> + withSysupdate =3D true; >>> + }) >>> + ]); >>=20 >> Let's fix this upstream instead: >>=20 >> https://github.com/NixOS/nixpkgs/pull/461277 > > Is it okay if I keep this until that PR is merged and Spectrum uses > a nixpkgs that has it? I'd prefer to not send patches that I can't > test, and without that PR the override is still needed. Even after > the PR is merged, the override is harmless. I'll add a link to the > PR in a comment. Yeah that's fine. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQQGoGac7QfI+H5ZtFCZddwkt31pFQUCaRcZnAAKCRCZddwkt31p FWw7AQClDA/pBxexJxfSfAWewxpagGAWlnMUsVa2oEayqVaPJwEAqYRjr/hBB1S7 VnfE0kxnxL8axkShtSOcMBgJRM9TjA0= =kh2z -----END PGP SIGNATURE----- --=-=-=--