Unverified Commit 959615c0 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge staging-nixos into staging-next

parents 469d81cc 9522d458

nixos/modules/config/terminfo.nix

+11 −0
Original line number Diff line number Diff line
@@ -66,6 +66,17 @@ 
      source = "${config.system.path}/share/terminfo";

    };



    boot.initrd.systemd.contents = lib.listToAttrs (

      lib.map

        (ti: lib.nameValuePair "/etc/terminfo/${ti}" { source = "${pkgs.ncurses}/share/terminfo/${ti}"; })

        [

          "l/linux"

          "v/vt100"

          "v/vt102"

          "v/vt220"

        ]

    );



    environment.profileRelativeSessionVariables = {

      TERMINFO_DIRS = [ "/share/terminfo" ];

    };

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -1590,6 +1590,7 @@ in 
  };

  systemd-initrd-simple = runTest ./systemd-initrd-simple.nix;

  systemd-initrd-swraid = runTest ./systemd-initrd-swraid.nix;

  systemd-initrd-terminfo = runTest ./systemd-initrd-terminfo.nix;

  systemd-initrd-vconsole = runTest ./systemd-initrd-vconsole.nix;

  systemd-initrd-vlan = runTest ./systemd-initrd-vlan.nix;

  systemd-journal = runTest ./systemd-journal.nix;

nixos/tests/systemd-initrd-terminfo.nix

0 → 100644
+22 −0
Original line number Diff line number Diff line 
{ lib, ... }:

{

  name = "systemd-initrd-terminfo";



  meta.maintainers = [ lib.maintainers.elvishjerricco ];



  nodes.machine =

    { config, ... }:

    {

      boot.initrd.systemd = {

        enable = true;

        extraBin.script = "${config.boot.initrd.systemd.package.util-linux}/bin/script";

      };

      testing.initrdBackdoor = true;

    };



  testScript = ''

    machine.wait_for_unit("initrd.target")

    rc, out = machine.execute("echo q | script -q -e -c 'yes | less' /dev/null")

    assert "terminals database is inaccessible" not in out

  '';

}