From 6c5b32aac2b9aa8a8aa31f20886e4e60b92d9d3f Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Tue, 26 Mar 2024 13:34:38 +0000
Subject: [PATCH] s6-rc: fix so the service manager knows about readiness
 notifications again

---
 modules/users/s6-rc.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/users/s6-rc.nix b/modules/users/s6-rc.nix
index 89f5081d..c99060fc 100644
--- a/modules/users/s6-rc.nix
+++ b/modules/users/s6-rc.nix
@@ -270,6 +270,9 @@ let
       mkdir $out/servicedirs/$svc
       # don't auto-start the service when i add the supervisor
       touch $out/servicedirs/$svc/down
+      # s6-rc needs to know if the service supports readiness notifications,
+      # as this will determine if it waits for it when starting.
+      ln -s ${compiled}/servicedirs/$svc/notification-fd $out/servicedirs/$svc/notification-fd
     done
   '';
 in
@@ -297,9 +300,9 @@ in
           local LIVE="$XDG_RUNTIME_DIR/s6/live"
 
           mkdir -p "$LIVE"  # create parent dirs
-          rm -rf "$LIVE"  # remove old state
+          rm -rf "$LIVE"/*  # remove old state
           # the live dir needs to be read+write. initialize it via the template in ~/.config/s6:
-          cp --dereference -R "$HOME/.config/s6/live" "$LIVE"
+          cp -R "$HOME/.config/s6/live"/* "$LIVE"
           chmod -R 0700 "$LIVE"
 
           # ensure the log dir, since that'll be needed by every service.