move service state out of s6 scandir
getting weird permission errors, seems simpler all raound just to put them somewhere else
This commit is contained in:
parent
1d9f39bf87
commit
3677ab9cb3
2 changed files with 10 additions and 8 deletions
|
@ -88,6 +88,6 @@ in {
|
|||
};
|
||||
services = {
|
||||
inherit longrun oneshot bundle target;
|
||||
output = service: name: "/run/s6-rc/scandir/${service.name}/data/outputs/${name}";
|
||||
output = service: name: "/run/service-state/${service.name}/${name}";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,15 +5,19 @@
|
|||
} :
|
||||
let
|
||||
inherit (liminix.services) longrun;
|
||||
in
|
||||
interface: { ... } @ args:
|
||||
let
|
||||
name = "${interface.device}.udhcp";
|
||||
script = writeShellScript "udhcp-notify" ''
|
||||
action=$1
|
||||
env > /run/udhcp.values
|
||||
|
||||
set_address() {
|
||||
ip address replace $ip/$mask dev $interface
|
||||
mkdir -p data/outputs
|
||||
dir=/run/service-state/${name}.service/
|
||||
mkdir -p $dir
|
||||
for i in lease mask ip router siaddr dns serverid subnet opt53 interface ; do
|
||||
echo ''${!i} > data/outputs/$i
|
||||
echo ''${!i} > $dir/$i
|
||||
done
|
||||
}
|
||||
case $action in
|
||||
|
@ -33,10 +37,8 @@ case $action in
|
|||
;;
|
||||
esac
|
||||
'';
|
||||
|
||||
in
|
||||
interface: { ... } @ args: longrun {
|
||||
name = "${interface.device}.udhcp";
|
||||
in longrun {
|
||||
inherit name;
|
||||
run = "${busybox}/bin/udhcpc -f -i ${interface.device} -s ${script}";
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue