Try running shell kill script as root

1 files changed, 12 insertions, 7 deletions

diff --git a/host/Rory-ovh/configuration.nix b/host/Rory-ovh/configuration.nix

index ac9add5..f90e99d 100755
--- a/host/Rory-ovh/configuration.nix
+++ b/host/Rory-ovh/configuration.nix
@@ -130,16 +130,21 @@
   };
   
   # prevent a hang on rebuild with forgotten shells...
-  systemd.services."container@spacebar" = {
+  systemd.services."container@spacebar" = 
+    let
+      mkKillShellScript = ctName: ("+-" + (pkgs.writeScript "kill-shell-" + ctName + "" ''
+        #!/bin/sh
+        for pid in $(pgrep -f "nixos-container root-login ${ctName}"); do
+          echo "Killing shell with PID $pid"
+          kill -9 "$pid"
+        done
+      ''));
+     in
+    {
     # dependency on postgres for good measure...
     after = [ "postgresql.service" ];
     wants = [ "postgresql.service" ];
-    preStop = ''
-      for pid in $(pgrep -f "nixos-container root-login spacebar"); do
-        echo "Killing shell with PID $pid"
-        kill -9 "$pid"
-      done
-    '';
+    serviceConfig.ExecStop = mkKillShellScript "spacebar";
   };
 
   #containers."syntest1" = import ./services/containers/syntest1/container.nix {