Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging

2018-03-03 22:40:32 +02:00
parent a5913ce272 618ac29687
commit 1e107443ad
101 changed files with 2988 additions and 748 deletions
@@ -118,7 +118,7 @@ in
        echo ${escapeShellArg key} >> /root/.ssh/authorized_keys
      '') cfg.authorizedKeys)}

-      dropbear -s -j -k -E -m -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"}
+      dropbear -s -j -k -E -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"}
    '';

    boot.initrd.secrets =