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 1786D5120; Thu, 04 Sep 2025 23:48:21 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id A37CF4EBB; Thu, 04 Sep 2025 23:48:06 +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-yb1-xb29.google.com (mail-yb1-xb29.google.com [IPv6:2607:f8b0:4864:20::b29]) by atuin.qyliss.net (Postfix) with ESMTPS id 3714E4E67 for ; Thu, 04 Sep 2025 23:48:00 +0000 (UTC) Received: by mail-yb1-xb29.google.com with SMTP id 3f1490d57ef6-e970acf352fso1676615276.2 for ; Thu, 04 Sep 2025 16:48:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757029679; x=1757634479; darn=spectrum-os.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=983TXjrY4Ycid4kON3KiLzQQF8Yeeo0FBrw+EjmtPGM=; b=MXjeRhB0sMGPwOwRvE/AW76cimv9l1DvEGIn3cQ9/xqTqAuWraGsy5LeCaLL9iU/EW Z3A+gan05r5UDVQBXVDN8iCZDkb7apAf400XQbkYbWL+Kq0NWiWG43/i3mOy+SCpHmph JMfgSCE+U6puAkLYE550kCY1wdRoqL3lrbzLFWLlS+0Nwe67EYBqHRhKTAdiOSwCjODK tkuFaAK4XtHMNXYtlhfIXk0DO0Ea76LLvn48GmOFjNV5eE/ydFwhoy8eiKIlvS5Hytpe iKH7NM1Sm2GFgCjZB8XQ+mR2XvYqQ298zsiHGGWwNbZIP4HWbXA2ApmbRsHpFFcaFiV+ cM2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757029679; x=1757634479; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=983TXjrY4Ycid4kON3KiLzQQF8Yeeo0FBrw+EjmtPGM=; b=L3mMjGEb5cjIx3huYzfcG/5vzbPfWT953eFQSad6L7BI9gxFoMZWZ5ZCCuucaQk0g/ baBPAs9l04DVFg9pN9gqZALVoWPJJLvmMAzAD4LLypTKWhK9BvP/LZSVsLyxkKO87dBi iBi23vnkP04ugWYValV9St62QUTdeqjiMEzn5E7zgcUHmSdvzpxgLFMwbJQtZOi+8f0A Nj03TzPUukWZWsePQHvgbHRfU3zOQeqWkREfMoWAe6PQ6n+89rv40e9Mj09yw78iamhJ cZloHXuOIciuFNzDx08qQyKH3/WpZUPJ6ZXidw6G13DypGjmKxW3l/+Kh1t/eYl7LQLt 0CEg== X-Gm-Message-State: AOJu0YxOQ1gXkXe3DpLHIlhV+j0oZDREoExOp6pjVFPKjDDYqh9Pf3Bw E+NhPufqu2FGbe9yuWrlyyAZhpsUpJL05gfzZfJ3dyStSztRy6X+zUpSrr+tTdmp X-Gm-Gg: ASbGncta3caZsMqKKqF15uffJKf3veIZHMCS47TsKlrSx38v+ZOY1kz7Qc4ptgNe47U tBEvNgvtWjwHRd18V7qWyU0y3FeGxVAuuz7DwfFjdWE95fq170hhD3vuDiitH6koaNt6uZs/+0+ 6I4V4uimDQAkXyqjzvS4BEGTbTUdCJJCip/Z+Lxmn4ht3skTokTeSJXTteSax6D6/1WLZ++Uuzb l4RcaIXwpqFySH6ljM5ef738wn51xHBJwV5N/vXB25j1qpjcoLbdz6wYFT75ID2JbPT7FTQvDvS ckueWqNASp61QE8sPFOhtH2LBbjrpQJfQ/xYPBbgUMZ2AsSj6FoHdgu7r0RjFc1LNo/Low1MkK2 xEAncXLZgJFHNAct60BGC9tHlhpUM5Tzmo7H6rjxUMeIcf+uun+5vBSQBd7sbGo8JUmP2cjnaoD 869mGZzDqVoQ+cHfVbQ/NwUa7XV0aYvzzu/u4QUDvHTZU= X-Google-Smtp-Source: AGHT+IFdwBuaeLbkXeVIlrfW/hhCmLYcA0TO9/3Vyws0FJdFf0dSfXBjOs/NgO/NVcN8AHJtR4aAoQ== X-Received: by 2002:a05:690e:164f:b0:5fc:42d7:e0e with SMTP id 956f58d0204a3-601780c811fmr3604024d50.30.1757029678910; Thu, 04 Sep 2025 16:47:58 -0700 (PDT) Received: from localhost.localdomain (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with UTF8SMTPSA id 00721157ae682-723a8329a59sm25440117b3.27.2025.09.04.16.47.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Sep 2025 16:47:58 -0700 (PDT) From: Demi Marie Obenour Date: Thu, 04 Sep 2025 17:26:37 -0400 Subject: [PATCH 15/20] host/rootfs: Use real less, not BusyBox less MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250904-systemd-v1-15-2a63b790a913@gmail.com> References: <20250904-systemd-v1-0-2a63b790a913@gmail.com> In-Reply-To: <20250904-systemd-v1-0-2a63b790a913@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1757021182; l=1655; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=dfTqqSgXrm+s7r1COEqeC6w+sAxfdQ9JovOI0TrY4Bw=; b=GNWn3hi9t6/49+OHvjKy0oAEuXdlprqKAL8cOfLUAWqNERDd3jW3T2o01VDXM9Px+enaAqPd5 0qUisZq4WEgAzwtzM8BLa2/C5DvFOFgM5hvWFODcSg0cD9RkdEMGrkg X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: OOQFTFT5JDWGDWUCUCC32QCKFZQMHXYU X-Message-ID-Hash: OOQFTFT5JDWGDWUCUCC32QCKFZQMHXYU 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: Demi Marie Obenour , Alyssa Ross 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: The version of less in BusyBox cannot handle horizontal scrolling, so it is much less useful for debugging than less(1). As long as it less is needed, it is better to have a more useful version. Signed-off-by: Demi Marie Obenour --- host/rootfs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index 0b16523703994138781fa01e069a77c37665ff36..e5246ba89918fb99a33e32976ba2a39d5603cfb8 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -9,8 +9,8 @@ pkgsStatic.callPackage ( { spectrum-host-tools , lib, stdenvNoCC, nixos, runCommand, writeClosure, erofs-utils, s6-rc , bcachefs-tools, busybox, cloud-hypervisor, cryptsetup, dbus, execline -, inkscape, iproute2, inotify-tools, jq, kmod, mdevd, s6, s6-linux-init, socat -, util-linuxMinimal, virtiofsd, xorg, xdg-desktop-portal-spectrum-host +, inkscape, iproute2, inotify-tools, jq, kmod, less, mdevd, s6, s6-linux-init +, socat, util-linuxMinimal, virtiofsd, xorg, xdg-desktop-portal-spectrum-host }: let @@ -80,7 +80,7 @@ let packages = [ bcachefs-tools cloud-hypervisor dbus execline inotify-tools - iproute2 jq kmod mdevd s6 s6-linux-init s6-rc socat + iproute2 jq kmod less mdevd s6 s6-linux-init s6-rc socat spectrum-host-tools virtiofsd xdg-desktop-portal-spectrum-host (cryptsetup.override { @@ -102,6 +102,7 @@ let CONFIG_INIT n CONFIG_INSMOD n CONFIG_IP n + CONFIG_LESS n CONFIG_LPD n CONFIG_LPQ n CONFIG_LPR n -- 2.51.0