From f2937b74854625b664eb5cb5ca900d80cf0c390b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 1 Mar 2018 21:21:27 -0500 Subject: [PATCH 1/2] initrd-ssh: Fix for new dropbear version. For some reason 2018.76 dropped the -m flag. --- nixos/modules/system/boot/initrd-ssh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index cdeff484594..8b3dc2d90eb 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -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 = From 4953a006f56f26cdd1b9889cf91d52356dd1320e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 1 Mar 2018 21:27:25 -0500 Subject: [PATCH 2/2] Revert "dropbear: 2017.75 -> 2018.76" This reverts commit db913f844539b1769c305a9a5cffd4fe0c1f350a. --- pkgs/tools/networking/dropbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index b7ef3b8fa75..709fb9540d1 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dropbear-2018.76"; + name = "dropbear-2017.75"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj"; + sha256 = "1309cm2aw62n9m3h38prvgsqr8bj85hfasgnvwkd42cp3k5ivg3c"; }; dontDisableStatic = enableStatic;