diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-06 21:48:26 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-06 21:48:26 -0600 |
| commit | 751c03e8fd06cb4b60795917cf4f0df6390913e7 (patch) | |
| tree | 41d4d0faedf2704da58be6763369637209d9a293 /nixos/modules/system/boot | |
| parent | 8e05911ccb73c28b3040cd0a1ef240e655a1e83c (diff) | |
| parent | 215c91d79e821834158ed4d69b72c1b39a671fd9 (diff) | |
| download | nixpkgs-751c03e8fd06cb4b60795917cf4f0df6390913e7.tar nixpkgs-751c03e8fd06cb4b60795917cf4f0df6390913e7.tar.gz nixpkgs-751c03e8fd06cb4b60795917cf4f0df6390913e7.tar.bz2 nixpkgs-751c03e8fd06cb4b60795917cf4f0df6390913e7.tar.lz nixpkgs-751c03e8fd06cb4b60795917cf4f0df6390913e7.tar.xz nixpkgs-751c03e8fd06cb4b60795917cf4f0df6390913e7.tar.zst nixpkgs-751c03e8fd06cb4b60795917cf4f0df6390913e7.zip | |
Merge pull request #47665 from erikarvstedt/initrd-improvements
Minor initrd improvements
Diffstat (limited to 'nixos/modules/system/boot')
| -rw-r--r-- | nixos/modules/system/boot/initrd-network.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/system/boot/initrd-ssh.nix | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix index dd0ea69e968..cb8fc957a99 100644 --- a/nixos/modules/system/boot/initrd-network.nix +++ b/nixos/modules/system/boot/initrd-network.nix @@ -56,7 +56,8 @@ in is acquired using DHCP. You should add the module(s) required for your network card to - boot.initrd.availableKernelModules. lspci -v -s <ethernet controller> + boot.initrd.availableKernelModules. + <literal>lspci -v | grep -iA8 'network\|ethernet'</literal> will tell you which. ''; }; diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 53e993603e2..2d3e3b05c98 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -82,6 +82,7 @@ in default = config.users.users.root.openssh.authorizedKeys.keys; description = '' Authorized keys for the root user on initrd. + Note that Dropbear doesn't support OpenSSH's Ed25519 key type. ''; }; |