about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorErik Arvstedt <erik.arvstedt@gmail.com>2018-10-02 17:38:06 +0200
committerErik Arvstedt <erik.arvstedt@gmail.com>2018-10-02 17:38:06 +0200
commit215c91d79e821834158ed4d69b72c1b39a671fd9 (patch)
tree0052345fb889fe26d157c0d8d7aa4aa788bff9af /nixos/modules
parent395019b38d841428eb003375d6a30fb2f23d8a92 (diff)
downloadnixlib-215c91d79e821834158ed4d69b72c1b39a671fd9.tar
nixlib-215c91d79e821834158ed4d69b72c1b39a671fd9.tar.gz
nixlib-215c91d79e821834158ed4d69b72c1b39a671fd9.tar.bz2
nixlib-215c91d79e821834158ed4d69b72c1b39a671fd9.tar.lz
nixlib-215c91d79e821834158ed4d69b72c1b39a671fd9.tar.xz
nixlib-215c91d79e821834158ed4d69b72c1b39a671fd9.tar.zst
nixlib-215c91d79e821834158ed4d69b72c1b39a671fd9.zip
nixos/initrd: improve descriptions
The improved lspci command shows all available ethernet controllers and
their kernel modules. Previously, the user had to provide the slot name
of a specific device.
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/system/boot/initrd-network.nix3
-rw-r--r--nixos/modules/system/boot/initrd-ssh.nix1
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 384ae909b701..1bc3f906add4 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -45,7 +45,8 @@ in
         is acquired using DHCP.
 
         You should add the module(s) required for your network card to
-        boot.initrd.availableKernelModules. lspci -v -s &lt;ethernet controller&gt;
+        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 53e993603e27..2d3e3b05c980 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.
       '';
     };