liminix

commit a48d51ffdc8c2a38c36663535f126cb6d8c36e61
parent f249c12becccaf39fb864e6ce0217c90d4db1044
Author: Daniel Barlow <dan@telent.net>
Date:   Sun, 21 May 2023 12:01:42 +0100

keep dropbear host keys in /persist if it exists

Diffstat:
M
examples/rotuer.nix
 | 
8
+++++---
M
modules/jffs2.nix
 | 
2
+-

2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/examples/rotuer.nix b/examples/rotuer.nix
@@ -149,12 +149,14 @@ in rec {
       run = "${pkgs.chrony}/bin/chronyd -f ${config} -d";
     };
 
-
   services.sshd = longrun {
     name = "sshd";
     run = ''
-      mkdir -p /run/dropbear
-      ${dropbear}/bin/dropbear -E -P /run/dropbear.pid -R -F
+      if test -d /persist; then
+        mkdir -p /persist/secrets/dropbear
+        ln -s /persist/secrets/dropbear /run
+      fi
+      ${dropbear}/bin/dropbear -E -R -P /run/dropbear.pid  -F
     '';
   };
 
diff --git a/modules/jffs2.nix b/modules/jffs2.nix
@@ -32,7 +32,7 @@ in
         in runCommand "make-jffs2" {
           depsBuildBuild = [ mtdutils ];
         } ''
-          mkdir -p $TMPDIR/empty/nix/store/
+          mkdir -p $TMPDIR/empty/nix/store/ $TMPDIR/empty/secrets
           cp ${systemConfiguration}/bin/activate $TMPDIR/empty/activate
           ln -s ${pkgs.s6-init-bin}/bin/init $TMPDIR/empty/init
           grafts=$(sed < ${systemConfiguration}/etc/nix-store-paths 's/^\(.*\)$/--graft \1:\1/g')