Re: [PATCH 15/20] host/rootfs: Use real less, not BusyBox less

[Alyssa Ross <hi@alyssa.is>]

[-- Attachment #1: Type: text/plain, Size: 1813 bytes --]

Demi Marie Obenour <demiobenour@gmail.com> writes:

> 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 <demiobenour@gmail.com>

Is it needed?

> ---
>  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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]