dan/liminix
1
0
Fork 5
Code

secrets subscriber: make restart-all work

Browse Source
This commit is contained in:
Daniel Barlow 2025-03-31 23:01:48 +01:00
parent 46ed8f0199
commit d9723aeb87
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/secrets/subscriber.nix
View File

@ -5,6 +5,7 @@
s6, s6,
s6-rc, s6-rc,
watch-outputs, watch-outputs,
s6-rc-up-tree
}: }:
{ {
watch, watch,
@ -47,7 +48,7 @@ let
echo waiting for $dir echo waiting for $dir
if test -e $dir/notification-fd; then flag="-U"; else flag="-u"; fi if test -e $dir/notification-fd; then flag="-U"; else flag="-u"; fi
${s6}/bin/s6-svwait $flag /run/service/${name} || exit ${s6}/bin/s6-svwait $flag /run/service/${name} || exit
PATH=${s6-rc}/bin:${s6}/bin:$PATH PATH=${s6-rc}/bin:${s6}/bin:${s6-rc-up-tree}/bin:$PATH
${watch-outputs}/bin/watch-outputs ${restart-flag} ${name} ${refs} ${watch-outputs}/bin/watch-outputs ${restart-flag} ${name} ${refs}
''; '';
}; };

2
pkgs/watch-outputs/watch-outputs.fnl
View File

@ -54,7 +54,7 @@
(fn do-action [action service] (fn do-action [action service]
(case action (case action
:restart (system (%% "s6-svc -r /run/service/%s" service)) :restart (system (%% "s6-svc -r /run/service/%s" service))
:restart-all (system (%% "s6-rc -b -d %q; s6-rc-up-tree %q" service service)) :restart-all (system (%% "s6-rc -b -d change %q; s6-rc-up-tree %q" service service))
[:signal n] (system (%% "s6-svc -s %q /run/service/%s" n service)))) [:signal n] (system (%% "s6-svc -s %q /run/service/%s" n service))))
(local POLLIN 0x0001) (local POLLIN 0x0001)