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 0B9D21FAE7; Thu, 13 Nov 2025 15:22:54 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 92BA21FB40; Thu, 13 Nov 2025 15:22:51 +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-a1-smtp.messagingengine.com (fout-a1-smtp.messagingengine.com [103.168.172.144]) by atuin.qyliss.net (Postfix) with ESMTPS id 7B8561FB3D for ; Thu, 13 Nov 2025 15:22:49 +0000 (UTC) Received: from phl-compute-07.internal (phl-compute-07.internal [10.202.2.47]) by mailfout.phl.internal (Postfix) with ESMTP id C2734EC01E0; Thu, 13 Nov 2025 10:22:47 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-07.internal (MEProxy); Thu, 13 Nov 2025 10:22:47 -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=1763047367; x=1763133767; bh=QghRB4dT+Z SMtIEiLec1y+HthlHSkvVnaOftHERrTSg=; b=CEuu/dYePBx4WKq29y97SlB5n8 PkjETxNLBJCunVS+xsrAkE2Fik16oWxHDdYsqcoL0dcon90jcAYxp+WGzsQhvc33 UX0IMzHSKA9fa/prTNGS0QM9pAGI1AuRlpKPpb8Wdl1huHN5X6PWRLUF56+MWFmk dcNWlTS5Kqs3xtYVEnpVt5FbZfV1fc4KrwMZjdvCYGIJmST/9fXdHCcqDlK0/Tzm aM21m0WZyHwaiYlKXLgHPi3tTYAHSPHt5qRfgg+2iIXwoGHAgHiP44GmuTbVOdEx 2DUcFXXq5rklNy8olT0yGaapwhaGSBfdUrhknt+0juGU2EqbJA97pv+KkWWw== 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= 1763047367; x=1763133767; bh=QghRB4dT+ZSMtIEiLec1y+HthlHSkvVnaOf tHERrTSg=; b=iFoL4pnG9GFoMgqX5RctxGvLpVIeQ6VkM90tAM3XJVaIjaiqiBV d0zncS1mj4nPHjh7R4zAsvoqDhMCiI2dsoQpMKuUWrM+dP6265r2qSylfScMaQ39 S7XEtqU7XeErXSK6a9hl9Vsf3ldy3f/jQP6Nh5Hud7K24tz/XMLdwAHZ2spZg0By Pp4UlJBxxBzRTdqRWHv5nzjpELdc7Ar6i5mNudqfaoAaWF/7hbNF68kyR+qc15YD YbGN77jVVaMfKEsKNw/KzrIVs4dx14j09Or6x60oME9b7/3d/vwEKvlx4fE8dR8h xS8nTpO/NGZNcHYB3Wi1QidSUIj1hAYBV8Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggddvtdejvdelucetufdoteggodetrf 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; Thu, 13 Nov 2025 10:22:46 -0500 (EST) Received: by mbp.qyliss.net (Postfix, from userid 1000) id D01D1697B2DF; Thu, 13 Nov 2025 16:22:45 +0100 (CET) From: Alyssa Ross To: Demi Marie Obenour Subject: Re: [PATCH v2 2/8] host/rootfs: Install systemd-pull In-Reply-To: <20251112-updates-v2-2-88d96bf81b79@gmail.com> References: <20251112-updates-v2-0-88d96bf81b79@gmail.com> <20251112-updates-v2-2-88d96bf81b79@gmail.com> Date: Thu, 13 Nov 2025 16:22:44 +0100 Message-ID: <87o6p69cu3.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Message-ID-Hash: YFLHA6UO7NF4CQ3V5DQQNDMSVD3PAAPD X-Message-ID-Hash: YFLHA6UO7NF4CQ3V5DQQNDMSVD3PAAPD 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: > 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..c2045ad96cca37a1bf1a7b82a= a35a583cc5aee93 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-dso-= 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 work. > + (systemd.override { > + withImportd =3D true; > + withSysupdate =3D true; > + }) > + ]); Let's fix this upstream instead: https://github.com/NixOS/nixpkgs/pull/461277 >=20=20 > appvms =3D { > appvm-firefox =3D callSpectrumPackage ../../vm/app/firefox.nix {}; > @@ -85,6 +94,16 @@ let > lndir -ignorelinks -silent "$pkg" "$out/usr" > done >=20=20 > + # If systemd-pull is missing systemd-sysupdate will fail with a > + # very confusing error message. If systemd-sysupdate doesn't work, > + # users will not be able to receive an update that fixes the problem. > + for i in sysupdate pull; do > + if ! cat -- "$out/usr/lib/systemd/systemd-$i" > /dev/null; then > + echo "link to systemd-$i didn't get installed" >&2 > + exit 1 > + fi > + done > + > # Weston doesn't support SVG icons. > inkscape -w 20 -h 20 \ > -o $out/usr/share/icons/hicolor/20x20/apps/com.system76.CosmicFi= les.png \ > Looks like this will be fixed upstream (as a build error) in the next systemd release. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRV/neXydHjZma5XLJbRZGEIw/wogUCaRX3xAAKCRBbRZGEIw/w ohWTAQCS0nLzM9vFxZRRo044g6bhRn+8p/na1jcl1X7J0TbyPAD8CUgAygbLp2mi wGzcRkJhduVkCzE5Z2T9oz11XL+ODgw= =vpUu -----END PGP SIGNATURE----- --=-=-=--