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 3F5AC18D1F; Sat, 01 Nov 2025 03:25:28 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id E6CB118D17; Sat, 01 Nov 2025 03:25:25 +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-yx1-xb136.google.com (mail-yx1-xb136.google.com [IPv6:2607:f8b0:4864:20::b136]) by atuin.qyliss.net (Postfix) with ESMTPS id 05AC118D94 for ; Sat, 01 Nov 2025 03:25:25 +0000 (UTC) Received: by mail-yx1-xb136.google.com with SMTP id 956f58d0204a3-63f7c7185c5so3176127d50.3 for ; Fri, 31 Oct 2025 20:25:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761967523; x=1762572323; darn=spectrum-os.org; h=autocrypt:in-reply-to:content-language:references:cc:to:subject :from:user-agent:mime-version:date:message-id:from:to:cc:subject :date:message-id:reply-to; bh=kQ7kVN/zEx28hhtMzzA+l37rS0YGw1ejbJFhBnHLPA0=; b=kcckQuVBKWqfAPJTJJlfAfL+dniSMCUmMhJeKX98fTTYVsY6oughqrwP3Irq9rrRgZ 6ciHxeyiLh2whf2H5sd6cWuPeSQ3ipbfAb8tH9qjvrTjP3QpSGOYKjpYXe6gwZ08C+pf ALMdulvO2hMjK7XUnNtDIOO/Ayr8ec3T8nJRFUcUWacv0NRV20Ox++/EaH1wDUuyrtsI 3rLT3U8PGAayaTn3i/KnV6uC/lJtWR/bUlMl7GyZQzaoLcQbZMT/sEKOHFQ25X9XalpS B5s0Z3tymxeBB1BTjYIlOEBNCkcD3klh3UnjBWOdnDH4ita1zaYBpSNIjBH7WlPuJnW1 9t4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761967523; x=1762572323; h=autocrypt:in-reply-to:content-language:references:cc:to:subject :from:user-agent:mime-version:date:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=kQ7kVN/zEx28hhtMzzA+l37rS0YGw1ejbJFhBnHLPA0=; b=aKmBBSmr/+8kFWwgl6VdTNrMlqJUuMFYMW5irS5d6LHPKgCxpd3H0KGPHEdsF2rQ5t te40gqyRIJWzVd+73pRFMHFZst7tS/n6XXw0wG/8kKVe5I1MEQQseYYILfjN8paIyalA RsdDSGLabxKahieX7MYsL9Mvai8KJjCmnGWXOwLm6ZJ4b+Nhb3j8UATsbLk7FcJ94a7R 0SVn36yz0HbZVVOEz9NkN2YdN8ENcUhGOcxghV33eDFxv8dRTCDY/vzQOc6HzHUDKBWI ecIXnvCTtAPLEhALkZUuBi08O6sLlPzG4gns6Jin5W8EfPetCc3MdF2Ix9JBil7uhLtZ NFWw== X-Gm-Message-State: AOJu0YypaNfVdeJ/gxiAm0TivA79KxlJI+r3rpSaA+eYRL0QxM5K8LEP iyKa+ICFKhMfGwvCjePpemS8EIYAnm7PUf0DpUOq06UgYCOkNFnES1aW5y5Ydg== X-Gm-Gg: ASbGncutgpoDiBg9/BcKHBNollFbhwEqhAcyUsbA/5xSLeBE8fV2X1Xn9zfby4XaqtS iTGLPN4Lo4I1/G/RFbFWLP+k5J2VmoopC4Yp2yTtd32xAiNf6oCaugomMhxb308CiX3LyLiqFKI FtIaJcRlt+2S52rnb59B4FpdZf+8zYjzB4TcFjve27JQOM79lPTeswXZBJOBxXGURyZV59ifCE/ IcOji9ovxwjUcEQOSXJyvbbgwkJgkvyKFUr4+KbO1LB/e8Wkw+leSHOc4lkuEg4fhdI/YLF+4ch T/KbCVKsbYcpVZkUfmOC02xzjgCYayhoRu5nz1JeiCCzfFOT5ixAzwrbGeozJK8H06tlP/8pjzp Sr5pBaMywDDhrWvTo8Wqd06IlUzZX4BzyoNQ5x77lyx5GOkw1enMdbrliJF9n5qXSciDF06SicI 8MwTQX/ZIttwvmSe/atvXSQPoOkKeSTXzwVusntOZilTBSSdLPVE5zXpfCCzhwzXaJ+9Irfxmta eu/9unXQEcNB/QmyyzVar8a3XY= X-Google-Smtp-Source: AGHT+IENVHy+Wr98gqRyfAQyO8PGpISa33pONnKV9aj6SeHUZzTajtq5beGZR6mhNL/S8M2sHdtLVA== X-Received: by 2002:a05:690e:d86:b0:63f:a089:ad11 with SMTP id 956f58d0204a3-63fa089adafmr1557828d50.47.1761967523519; Fri, 31 Oct 2025 20:25:23 -0700 (PDT) Received: from [10.138.34.110] (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-63f96a50af0sm999235d50.17.2025.10.31.20.25.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 31 Oct 2025 20:25:22 -0700 (PDT) Message-ID: <573737f4-3146-4dd0-b0fd-63fc94e54654@gmail.com> Date: Fri, 31 Oct 2025 23:25:18 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Demi Marie Obenour Subject: Re: [PATCH 1/7] host/rootfs: Use full util-linux and systemd To: Alyssa Ross References: <20251029-updates-v1-0-401c1be2a11b@gmail.com> <20251029-updates-v1-1-401c1be2a11b@gmail.com> <87y0ouj5x7.fsf@alyssa.is> Content-Language: en-US In-Reply-To: <87y0ouj5x7.fsf@alyssa.is> Autocrypt: addr=demiobenour@gmail.com; keydata= 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 +MYSfkEjBz0E8CLOcAw7JIwAaeBT Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------TClOqDwgp8Buog30AP0DnX5y" Message-ID-Hash: FL76O5LVELJDDMNFYEI736EJT7ZWOUSF X-Message-ID-Hash: FL76O5LVELJDDMNFYEI736EJT7ZWOUSF 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: 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: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------TClOqDwgp8Buog30AP0DnX5y Content-Type: multipart/mixed; boundary="------------unvFqV33a7lUQgb3meQ878YE"; protected-headers="v1" From: Demi Marie Obenour To: Alyssa Ross Cc: Spectrum OS Development Message-ID: <573737f4-3146-4dd0-b0fd-63fc94e54654@gmail.com> Subject: Re: [PATCH 1/7] host/rootfs: Use full util-linux and systemd References: <20251029-updates-v1-0-401c1be2a11b@gmail.com> <20251029-updates-v1-1-401c1be2a11b@gmail.com> <87y0ouj5x7.fsf@alyssa.is> In-Reply-To: <87y0ouj5x7.fsf@alyssa.is> Autocrypt-Gossip: addr=hi@alyssa.is; keydata= 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 k2wOTWzl7wFH --------------unvFqV33a7lUQgb3meQ878YE Content-Type: multipart/mixed; boundary="------------6bC5mppoWRcM3w9OaXyPU780" --------------6bC5mppoWRcM3w9OaXyPU780 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 10/29/25 07:36, Alyssa Ross wrote: > Demi Marie Obenour writes: >=20 >> Busybox provides a broken fdisk that doesn't support GPT, only MBR. >> The systemd built against musl doesn't include systemd-pull, so >> systemd-sysupdate doesn't work. Therefore, use all of util-linux's >> command-line tools, and use systemd built against glibc. >=20 > That's a problem that's going to need to be fixed. We're not mixing tw= o > different libcs on the host. Unfortunately, systemd-pull can't be built with musl libc. That leaves four options: 1. Try to fix the build problem, knowing that it could come back. 2. Mix two libcs on the host. 3. Try to fix the build (but this could take quite a while to upstream). 4. Use glibc on the host. I don't think we should ship with option 2, but I think it might be acceptable until the underlying problem is solved. >> Signed-off-by: Demi Marie Obenour >> --- >> host/rootfs/default.nix | 43 ++++++++++++++++++----------------------= --- >> 1 file changed, 18 insertions(+), 25 deletions(-) >=20 > Okay idea overall. I like the idea of less busybox. Busybox =E2=86=92= > util-linux should probably be a patch of its own. Will fix in v2. >> diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix >> index 0d79f7ca54ccc86eb0fa6e743f2011237d365f24..00052222507077b9e94a5e= d0a3fbddd27caeefc3 100644 >> --- a/host/rootfs/default.nix >> +++ b/host/rootfs/default.nix >> @@ -4,20 +4,20 @@ >> =20 >> import ../../lib/call-package.nix ( >> { callSpectrumPackage, spectrum-build-tools, src >> -, pkgsMusl, pkgsStatic, linux_latest >> +, pkgsMusl, pkgsStatic, linux_latest, systemd >> }: >> pkgsStatic.callPackage ( >> =20 >> { busybox, cloud-hypervisor, cryptsetup, dbus, erofs-utils, execline >> , inkscape, inotify-tools, iproute2, jq, lib, mdevd, nixos >> , runCommand, s6, s6-linux-init, s6-rc, socat, spectrum-host-tools >> -, stdenvNoCC, util-linuxMinimal, virtiofsd, writeClosure >> +, stdenvNoCC, util-linux, virtiofsd, writeClosure >=20 > util-linuxMinimal =3D util-linux.override { > cryptsetupSupport =3D false; > nlsSupport =3D false; > ncursesSupport =3D false; > pamSupport =3D false; > shadowSupport =3D false; > systemdSupport =3D false; > translateManpages =3D false; > }; >=20 > So how come we need the non-minimal version? I didn't check. >> # Weston doesn't support SVG icons. >> inkscape -w 20 -h 20 \ >> -o $out/usr/share/icons/hicolor/20x20/apps/com.system76.Cosmi= cFiles.png \ >> ${cosmic-files}/share/icons/hicolor/24x24/apps/com.system76.C= osmicFiles.svg >> =20 >> - ln -st $out/usr/bin \ >> - ${concatMapStringsSep " " (p: "${p}/bin/*") packages} \ >> - ${xdg-desktop-portal}/libexec/xdg-document-portal \ >> - ${xdg-desktop-portal-gtk}/libexec/xdg-desktop-portal-gtk >> + ln -sft "$out/usr/bin" \ >> + ${concatMapStringsSep " " (p: "${escapeShellArg p}/bin/*") pa= ckages} \ >> + ${escapeShellArg xdg-desktop-portal}/libexec/xdg-document-por= tal \ >> + ${escapeShellArg xdg-desktop-portal-gtk}/libexec/xdg-desktop-= portal-gtk >> ln -st $out/usr/share/dbus-1 \ >> - ${dbus}/share/dbus-1/session.conf >> + ${escapeShellArg dbus}/share/dbus-1/session.conf >> ln -st $out/usr/share/dbus-1/services \ >> - ${xdg-desktop-portal-gtk}/share/dbus-1/services/org.freedeskt= op.impl.portal.desktop.gtk.service >> - >> - for pkg in ${escapeShellArgs usrPackages}; do >> - lndir -ignorelinks -silent "$pkg" "$out/usr" >> - done >> + ${escapeShellArg xdg-desktop-portal-gtk}/share/dbus-1/service= s/org.freedesktop.impl.portal.desktop.gtk.service >=20 > Unrelated changes. We don't need to escape Nix store paths, because we= > rely on Nixpkgs, which would break if store paths had weird characters > in them. Will drop in v2. >> + # clobber any conflicting files from busybox >> + ln -sft "$out/usr/bin" ${escapeShellArg util-linux}/bin/* >=20 > The approach we've taken so far is to disable those tools in Busybox, > and avoid conflicting symlinks, and I like that better. Alternatively,= > if you want to figure out which Busybox tools are actually needed, we > could switch to a minimal build and enable only what we use. I don't want to block on either of those, and I'd rather not risk breaking the build whenever util-linux adds a new tool. It's pretty clear that util-linux is to be preferred over Busybox in the event of a conflict. This does add bloat, but there are far *more* sources of bloat right now, so I think that should be part of a more general debloating effort. >> ${concatStrings (mapAttrsToList (name: path: '' >> ln -s ${path} $out/usr/lib/spectrum/vm/${name} >> '') appvms)} >> - >> - # TODO: this is a hack and we should just build the util-linux >> - # programs we want. >> - # https://lore.kernel.org/util-linux/87zgrl6ufb.fsf@alyssa.is/ >> - ln -s ${util-linuxMinimal}/bin/{findfs,uuidgen,lsblk,mount} $out/= usr/bin >> - >> - # TODO: this is another hack and it should be possible >> - # to build systemd without this. >> - ln -s -- ${lib.escapeShellArg systemd}/bin/udevadm "$out/usr/bin"= >> ''; >> in >> =20 >> >> --=20 >> 2.51.2 --=20 Sincerely, Demi Marie Obenour (she/her/hers) --------------6bC5mppoWRcM3w9OaXyPU780 Content-Type: application/pgp-keys; name="OpenPGP_0xB288B55FFF9C22C1.asc" Content-Disposition: attachment; filename="OpenPGP_0xB288B55FFF9C22C1.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xsFNBFp+A0oBEADffj6anl9/BHhUSxGTICeVl2tob7hPDdhHNgPR4C8xlYt5q49y B+l2nipdaq+4Gk6FZfqC825TKl7eRpUjMriwle4r3R0ydSIGcy4M6eb0IcxmuPYf bWpr/si88QKgyGSVZ7GeNW1UnzTdhYHuFlk8dBSmB1fzhEYEk0RcJqg4AKoq6/3/ UorR+FaSuVwT7rqzGrTlscnTDlPWgRzrQ3jssesI7sZLm82E3pJSgaUoCdCOlL7M MPCJwI8JpPlBedRpe9tfVyfu3euTPLPxwcV3L/cfWPGSL4PofBtB8NUU6QwYiQ9H zx4xOyn67zW73/G0Q2vPPRst8LBDqlxLjbtx/WLR6h3nBc3eyuZ+q62HS1pJ5EvU T1vjyJ1ySrqtUXWQ4XlZyoEFUfpJxJoN0A9HCxmHGVckzTRl5FMWo8TCniHynNXs BtDQbabt7aNEOaAJdE7to0AH3T/Bvwzcp0ZJtBk0EM6YeMLtotUut7h2Bkg1b//r 6bTBswMBXVJ5H44Qf0+eKeUg7whSC9qpYOzzrm7+0r9F5u3qF8ZTx55TJc2g656C 9a1P1MYVysLvkLvS4H+crmxA/i08Tc1h+x9RRvqba4lSzZ6/Tmt60DPM5Sc4R0nS m9BBff0Nm0bSNRS8InXdO1Aq3362QKX2NOwcL5YaStwODNyZUqF7izjK4QARAQAB zTxEZW1pIE9iZW5vdXIgKElUTCBFbWFpbCBLZXkpIDxhdGhlbmFAaW52aXNpYmxl dGhpbmdzbGFiLmNvbT7CwY4EEwEIADgWIQR2h02fEza6IlkHHHGyiLVf/5wiwQUC X6YJvQIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCyiLVf/5wiwWRhD/0Y R+YYC5Kduv/2LBgQJIygMsFiRHbR4+tWXuTFqgrxxFSlMktZ6gQrQCWe38WnOXkB oY6n/5lSJdfnuGd2UagZ/9dkaGMUkqt+5WshLFly4BnP7pSsWReKgMP7etRTwn3S zk1OwFx2lzY1EnnconPLfPBc6rWG2moA6l0WX+3WNR1B1ndqpl2hPSjT2jUCBWDV rGOUSX7r5f1WgtBeNYnEXPBCUUM51pFGESmfHIXQrqFDA7nBNiIVFDJTmQzuEqIy Jl67pKNgooij5mKzRhFKHfjLRAH4mmWZlB9UjDStAfFBAoDFHwd1HL5VQCNQdqEc /9lZDApqWuCPadZN+pGouqLysesIYsNxUhJ7dtWOWHl0vs7/3qkWmWun/2uOJMQh ra2u8nA9g91FbOobWqjrDd6x3ZJoGQf4zLqjmn/P514gb697788e573WN/MpQ5XI Fl7aM2d6/GJiq6LC9T2gSUW4rbPBiqOCeiUx7Kd/sVm41p9TOA7fEG4bYddCfDsN xaQJH6VRK3NOuBUGeL+iQEVF5Xs6Yp+U+jwvv2M5Lel3EqAYo5xXTx4ls0xaxDCu fudcAh8CMMqx3fguSb7Mi31WlnZpk0fDuWQVNKyDP7lYpwc4nCCGNKCj622ZSocH AcQmX28L8pJdLYacv9pU3jPy4fHcQYvmTavTqowGnM08RGVtaSBNYXJpZSBPYmVu b3VyIChsb3ZlciBvZiBjb2RpbmcpIDxkZW1pb2Jlbm91ckBnbWFpbC5jb20+wsF4 BBMBAgAiBQJafgNKAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCyiLVf /5wiwYa/EACv8a2+MMou9cSCNoZBQaU+fTmyzft9hUE+0d5W2UY1RY3OsjFIzm9R /4SVccfsqOYLEo+S0vQMIIIqFEq3FCpXXwPzyimotps05VA8U3Bd7yseojFygOgK sAMOAee2RCaDDOnoJue01dfZMzzHPO/TVdp3OvnpWipfv5G1Xg96rwbhMLE3tg6N xwAHa31Bv4/Xq8CJOoIWvx6fcmZQpz01/lSvsYn0KrfEbTKkuUf0vM9JrCTCP2oz VNN5BYzqaq2M4r+jmSyeXLim922VOWqGkUEQ85BSEemqrRS06IU6NtEMsF8EWt/b hWjk/9GDKTcnpdJHTrMxTspExBiNrvpI2t+YPU5B/dJJAUxvmhFrbSIbdB8umBZs I3AMYrEmpAbh5x7jEjoskUC7uN3o9vpg1oCLS2ePDLtAtyBtbHnkA4xGD7ar8mem xpH9lY/i+sC6CyyIUWcUDnnagKyJP0m9ks0GLsTeOCA0bft2XA6rD6aaCnMUsndT ctrab42CV5XypjmC4U1rPJ8JQJUh1/3P48/8sMH+3krxpJ06KNWNFaUbaMTGiltZ 7x9DngklSYrX0T+2G4kVXNmjaljwkoLahwLla2gUWwBSyofXdqyhQdwZsp01KXNQ UCyT/Pg+aDcm/E7OMV3d4lf7g/CSxiX2GSEe6BlhSz+Lmd7ZJ3g32M1ARGVtaSBN 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 EtJuZYM5blWncBOJCoWMnBEcTEo/viU3GgcVRw=3D=3D =3Dx94R -----END PGP PUBLIC KEY BLOCK----- --------------6bC5mppoWRcM3w9OaXyPU780-- --------------unvFqV33a7lUQgb3meQ878YE-- --------------TClOqDwgp8Buog30AP0DnX5y Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEopQtqVJW1aeuo9/sszaHOrMp8lMFAmkFfaAACgkQszaHOrMp 8lOceA/6A5ChpFnG4eGEFFYADx/czyrlQl45BcXiL2n5ulVYBuf3H00ZUHEEsQMt UHKcuEB0rK7g4CwyNOPVdDaCVdtx0UeOJ9nfOoXX3BsMVuVkeCjQLEE1Zseuv4Bp r8MBoxCOiQ80uSkoagq3e4i7m8nBNUspDZhadix7ZEfpKrpedXUqoIxSo1J+YSW6 fWeHO1+sYH8/bYJ8E/XtclqFek7LEBdEaE919dDqbI3wE86nQBLYMpi1a/BtzTLJ hrw1ggsuDzsZeaJ1QjQQNsqa+ICXLKm1Tj5AXad+Yl6IlVjIYfcLW68eieLnR2d0 PlqM/3hjh98KMVJgftXRinV7XZx1VRU4hi5mBQyT0y5Kqieem1kt4PVKYaNYUL7D ypLNBvSAkaEG/qv6N2JjVbiSPHkUfMVzwx2tDyb6umiN54ZMUOw30fx51EhNQrAV mMcykz6jQ0QP9V9RF1X8gnsHSA1EjqMnqercqFWEuODECW6qt35JQWT5PPCrdizr yv1AwBTp8wUfQzmIL/kIOkj5kWhivH/oc3nhJCpNQIrD7C5fyaj48GhK7T3h9COw /SfziRrJNGhxbzsM+TDPRPGrlLlhkflTb4UJxQGUavRCkPmUG+y2Hv86DqdVjUPC NNTLfdeD2ohJhGkIaXGAT2AUbxo42pZD0xaSvviLDOZWhyXevpI= =wZa4 -----END PGP SIGNATURE----- --------------TClOqDwgp8Buog30AP0DnX5y--