raboof/liminix
1
0
Fork 0
forked from dan/liminix
Code Pull Requests Activity

rename isTrigger to restart-on-upgrade

Browse Source 
we're moving away from "trigger" services to "controller" services,
and "restart-on-upgrade" is the name used by s6-rc
This commit is contained in:
Daniel Barlow 2024-06-16 12:58:06 +01:00
parent c4185617c0
commit 7c9c801afc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ifwait/ifwait.nix
View File

@ -9,7 +9,7 @@ let
in longrun {
name = "ifwait.${interface.name}";
buildInputs = [ service ];
isTrigger = true;
restart-on-upgrade = true;
run = ''
${ifwait}/bin/ifwait -s ${service.name} $(output ${interface} ifname) ${state}
'';

2
modules/service-trigger/rule.nix
View File

@ -19,6 +19,6 @@ let
termsString = stringify terms;
in longrun {
name = "watch-for-${serviceName}";
isTrigger = true;
restart-on-upgrade = true;
run = "${uevent-watch}/bin/uevent-watch ${if symlink != null then "-n ${symlink}" else ""} -s ${serviceName} ${termsString}";
}

6
pkgs/liminix-tools/services/default.nix
View File

@ -38,15 +38,15 @@ let
, dependencies ? []
, contents ? []
, buildInputs ? []
, isTrigger ? false
, restart-on-upgrade ? false
, controller ? null
} @ args:
stdenvNoCC.mkDerivation {
# we use stdenvNoCC to avoid generating derivations with names
# like foo.service-mips-linux-musl
inherit name serviceType up down run finish notification-fd
producer-for consumer-for pipeline-name timeout-up timeout-down;
restart-on-upgrade = isTrigger;
producer-for consumer-for pipeline-name timeout-up timeout-down
restart-on-upgrade;
buildInputs = buildInputs ++ dependencies ++ contents ++ lib.optional (controller != null) controller;
inherit controller dependencies contents;
builder = ./builder.sh;