HackENS/liminix-fork
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

udhcp: write service responses as outputs

Browse source
This commit is contained in:
Daniel Barlow 2022-09-22 12:42:20 +01:00
parent 0b0efde12c
commit dd124e49dd
2 changed files with 50 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/liminix-tools/default.nix
View file

@ -80,6 +80,6 @@ in {
};
services = {
inherit longrun oneshot bundle target;
output = service: name: "/run/services/outputs/${service.name}/${name}";
output = service: name: "/run/s6-rc/scandir/${service.name}/data/outputs/${name}";
};
}

51
pkgs/liminix-tools/networking/udhcpc.nix
View file

@ -1,10 +1,57 @@
{
liminix
, busybox
, writeShellScript
} :
let inherit (liminix.services) longrun;
let
inherit (liminix.services) longrun;
script = writeShellScript "udhcp-notify" ''
action=$1
env > /run/udhcp.values
set_address() {
ip address replace $ip/$mask dev $interface
mkdir -p data/outputs
for i in lease mask ip router siaddr dns serverid subnet opt53 interface ; do
echo ''${!i} > data/outputs/$i
done
}
case $action in
deconfig)
ip address flush $interface
ip link set up dev $interface
;;
bound)
# this doesn't actually replace, it adds a new address.
set_address
;;
renew)
set_address
;;
nak)
echo "received NAK on $interface"
;;
esac
'';
in
interface: { ... } @ args: longrun {
name = "${interface.device}.udhcp";
run = "${busybox}/bin/udhcpc -f -i ${interface.device}";
run = "${busybox}/bin/udhcpc -f -i ${interface.device} -s ${script}";
}
# lease=86400
# mask=24
# ip=10.0.2.15
# router=10.0.2.2
# siaddr=10.0.2.2
# dns=10.0.2.3
# serverid=10.0.2.2
# subnet=255.255.255.0
# SHLVL=2
# opt53=05
# interface=eth0
# PATH=/nix/store/npy692wik809z3vdwrkrj2wixjkr33kp-busybox-mips-unknown-linux-musl-1.35.0/bin:/nix/store/
# pj0b27l5728cypa5mmagz0q8ibzpik0h-execline-mips-unknown-linux-musl-2.9.0.1-bin/bin:/nix/store/rfjiw4dnv29daqc9971qmica1h86l0s0-s6-linux-init-mips-unknown-linux-musl-1.0.8.0-bin/bin:/nix/store/4wn3jm7yy2gfi0is0yy75lifbq5zjwz7-s6-rc-mips-unknown-linux-musl-0.5.3.2-bin/bin:/usr/bin:/bin
# _=/nix/store/npy692wik809z3vdwrkrj2wixjkr33kp-busybox-mips-unknown-linux-musl-1.35.0/bin/env
# /