From 1dce7c0b82ff3d02ab2bdfef917d1dc47bb63399 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 3 Feb 2016 16:37:10 +0300
Subject: initrd-ssh module: don't check if network is up

We already do this in initrd-network.
---
 nixos/modules/system/boot/initrd-ssh.nix | 34 +++++++++++++++-----------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'nixos/modules/system/boot')

diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
index 506e42bc024d..4cdc81541955 100644
--- a/nixos/modules/system/boot/initrd-ssh.nix
+++ b/nixos/modules/system/boot/initrd-ssh.nix
@@ -96,29 +96,27 @@ in
     '';
 
     boot.initrd.network.postCommands = ''
-      if [ -n "$hasNetwork" ]; then
-        mkdir /dev/pts
-        mount -t devpts devpts /dev/pts
+      mkdir /dev/pts
+      mount -t devpts devpts /dev/pts
 
-        echo '${cfg.shell}' > /etc/shells
-        echo 'root:x:0:0:root:/root:${cfg.shell}' > /etc/passwd
-        echo 'passwd: files' > /etc/nsswitch.conf
+      echo '${cfg.shell}' > /etc/shells
+      echo 'root:x:0:0:root:/root:${cfg.shell}' > /etc/passwd
+      echo 'passwd: files' > /etc/nsswitch.conf
 
-        mkdir -p /var/log
-        touch /var/log/lastlog
+      mkdir -p /var/log
+      touch /var/log/lastlog
 
-        mkdir -p /etc/dropbear
-        ${optionalString (cfg.hostRSAKey != null) "ln -s ${cfg.hostRSAKey} /etc/dropbear/dropbear_rsa_host_key"}
-        ${optionalString (cfg.hostDSSKey != null) "ln -s ${cfg.hostDSSKey} /etc/dropbear/dropbear_dss_host_key"}
-        ${optionalString (cfg.hostECDSAKey != null) "ln -s ${cfg.hostECDSAKey} /etc/dropbear/dropbear_ecdsa_host_key"}
+      mkdir -p /etc/dropbear
+      ${optionalString (cfg.hostRSAKey != null) "ln -s ${cfg.hostRSAKey} /etc/dropbear/dropbear_rsa_host_key"}
+      ${optionalString (cfg.hostDSSKey != null) "ln -s ${cfg.hostDSSKey} /etc/dropbear/dropbear_dss_host_key"}
+      ${optionalString (cfg.hostECDSAKey != null) "ln -s ${cfg.hostECDSAKey} /etc/dropbear/dropbear_ecdsa_host_key"}
 
-        mkdir -p /root/.ssh
-        ${concatStrings (map (key: ''
-          echo -n ${escapeShellArg key} >> /root/.ssh/authorized_keys
-        '') cfg.authorizedKeys)}
+      mkdir -p /root/.ssh
+      ${concatStrings (map (key: ''
+        echo -n ${escapeShellArg key} >> /root/.ssh/authorized_keys
+      '') cfg.authorizedKeys)}
 
-        dropbear -s -j -k -E -m -p ${toString cfg.port}
-      fi
+      dropbear -s -j -k -E -m -p ${toString cfg.port}
     '';
 
   };
-- 
cgit 1.4.1