remove .service/.target/.bundle etc suffixes on service names

they don't seem to be providing value
This commit is contained in:
Daniel Barlow
2022-09-27 22:35:29 +01:00
parent 2e13f1372e
commit 0632b5102e
5 changed files with 12 additions and 10 deletions

View File

@@ -17,7 +17,7 @@ interface: {
let
name = "${interface.device}.pppoe";
ip-up = writeAshScript "ip-up" {} ''
outputs=/run/service-state/${name}.service/
outputs=/run/service-state/${name}/
mkdir -p $outputs
(cd $outputs
echo $1 > ifname

View File

@@ -14,7 +14,7 @@ action=$1
set_address() {
ip address replace $ip/$mask dev $interface
dir=/run/service-state/${name}.service/
dir=/run/service-state/${name}/
mkdir -p $dir
for i in lease mask ip router siaddr dns serverid subnet opt53 interface ; do
echo ''${!i} > $dir/$i

View File

@@ -16,7 +16,7 @@ let
, notification-fd ? null
, dependencies ? []
} @ args: stdenvNoCC.mkDerivation {
name = "${name}.service";
inherit name;
serviceType = "longrun";
buildInputs = dependencies;
dependencies = builtins.map (d: d.name) dependencies;
@@ -35,7 +35,7 @@ let
} @ args: stdenvNoCC.mkDerivation {
# stdenvNoCC is to avoid generating derivations with names
# like foo.service-mips-linux-musl
name = "${name}.service";
inherit name;
serviceType = "oneshot";
# does this suffice to make sure dependencies are included
# even though the built output has no references to their
@@ -62,7 +62,7 @@ let
shell = "${busybox}/bin/sh";
builder = ./builder.sh;
};
bundle = { name, ... } @args : target (args // { name = "${name}.bundle";});
bundle = { name, ... } @args : target (args // { inherit name;});
in {
inherit target bundle oneshot longrun output;
}