diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 09:02:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 09:02:10 +0200 |
| commit | 0b192a09767c05b38f3e2838c07e9600318bbbb5 (patch) | |
| tree | 4467053c39ef4bad71527cd5fda5cf92960575e8 /nixos/modules/system | |
| parent | dc5bbc4700dd95420f87141efcc0e6cb48a710f9 (diff) | |
| parent | 0e54c749114b79f6be78486086f5829b176fcba8 (diff) | |
| download | nixlib-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar nixlib-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.gz nixlib-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.bz2 nixlib-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.lz nixlib-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.xz nixlib-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.zst nixlib-0b192a09767c05b38f3e2838c07e9600318bbbb5.zip | |
Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/initrd-ssh.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index a881459bed18..3e2805a8c341 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -85,6 +85,10 @@ in }; config = mkIf (config.boot.initrd.network.enable && cfg.enable) { + assertions = [ { + assertion = cfg.hostRSAKey != null || cfg.hostDSSKey != null || cfg.hostECDSAKey != null; + message = "You should specify at least one host key for initrd SSH"; + } ]; boot.initrd.extraUtilsCommands = '' copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear |