forked from dan/liminix
rename isTrigger to restart-on-upgrade
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:
parent
c4185617c0
commit
7c9c801afc
|
@ -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}
|
||||
'';
|
||||
|
|
|
@ -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}";
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue