Unverified Commit 7e01098a authored by Emily's avatar Emily Committed by GitHub
Browse files

nixos/rngd: remove file, move warning to `rename.nix` (#453520)

parents 22a895a7 52527262

nixos/modules/module-list.nix

+0 −1
Original line number Diff line number Diff line
@@ -397,7 +397,6 @@ 
  ./security/pam_mount.nix

  ./security/please.nix

  ./security/polkit.nix

  ./security/rngd.nix

  ./security/rtkit.nix

  ./security/soteria.nix

  ./security/sudo-rs.nix

nixos/modules/rename.nix

+6 −0
Original line number Diff line number Diff line
@@ -411,6 +411,12 @@ in 
    (mkRemovedOptionModule [ "services" "simplesamlphp" ] ''

      services.simplesamlphp has been vulnerable and unmaintained in nixpkgs.

    '')

    (mkRemovedOptionModule [ "security" "rngd" ] ''

      rngd is not necessary for any device that the kernel recognises

      as an hardware RNG, as it will automatically run the krngd task

      to periodically collect random data from the device and mix it

      into the kernel's RNG.

    '')

    # Do NOT add any option renames here, see top of the file

  ];

}

nixos/modules/security/rngd.nix

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
{ lib, ... }:

let

  removed =

    k:

    lib.mkRemovedOptionModule [

      "security"

      "rngd"

      k

    ];

in

{

  imports = [

    (removed "enable" ''

      rngd is not necessary for any device that the kernel recognises

      as an hardware RNG, as it will automatically run the krngd task

      to periodically collect random data from the device and mix it

      into the kernel's RNG.

    '')

    (removed "debug" "The rngd module was removed, so its debug option does nothing.")

  ];

}