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

make ppp log to stderr not syslog

Browse source
This commit is contained in:
Daniel Barlow 2022-09-27 22:57:06 +01:00
parent 0632b5102e
commit dfdaa27f39
3 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
THOUGHTS.txt
View file

@ -168,9 +168,6 @@ Tue Sep 27 16:14:18 BST 2022
TODO list is getting both longer and shorter, though longer on TODO list is getting both longer and shorter, though longer on
average. average.
DONE 1) rename config.environment as .filesystem. and add module
types for it
2) perhaps we shouldn't use process-based services like [ou]dhcp as 2) perhaps we shouldn't use process-based services like [ou]dhcp as
queryable endpoint for interface addresses (e.g. when adding routes). queryable endpoint for interface addresses (e.g. when adding routes).
Instead have a separate service for interface address that depends on Instead have a separate service for interface address that depends on
@ -186,14 +183,8 @@ creates the interface instead of using an existing unconfigured one
5) write a test for udhcp 5) write a test for udhcp
DONE 6) squashfs size is ~ 14MB for a configuration with not much in it,
look for obvious wastes of space
7) some of the pppoe config should be moved into a ppp service 7) some of the pppoe config should be moved into a ppp service
8) some of configuration.nix (e.g. defining routes) should be moved into
tools
11) haven't done (overlayfs) overlays at all 11) haven't done (overlayfs) overlays at all
13) upgrade ppp to something with an ipv6-up-script option, move ppp and pppoe derivations into their own files 13) upgrade ppp to something with an ipv6-up-script option, move ppp and pppoe derivations into their own files
@ -203,19 +194,16 @@ tools
15) "ip address add" seems to magically recognise v4 vs v6 but 15) "ip address add" seems to magically recognise v4 vs v6 but
is that specified or fluke? is that specified or fluke?
DONE 18) maybe stop suffixing all the service names with .service 19) ship logs somehow to log collection system
19) syslogd - use busybox or s6? the only thing (so far) using it is pppd. 21) dhcp, dns, hostap service for lan
Maybe we could LD_PRELOAD it to use stderr instead
DONE 20) The option currently called defaultPackages needs a better name as
it doesn't have the same semantics as nixos
environment.defaultPackages. maybe call it packagesInProfile or
packagesOnPath. or defaultProfile.packages
22) support real hardware
Tue Sep 27 22:00:36 BST 2022 Tue Sep 27 22:00:36 BST 2022
Found the cause of huge image size: rp-pppoe ships with scripts that Found the cause of huge image size: rp-pppoe ships with scripts that
reference build-time packages, so we have x86-64 glibc in there reference build-time packages, so we have x86-64 glibc in there
We don't need syslog just to accommodate ppp, there's an underdocumented
option for it to log to a file descriptor

1
pkgs/liminix-tools/networking/pppoe.nix
View file

@ -32,6 +32,7 @@ let
"ip-up-script" ip-up "ip-up-script" ip-up
"ipparam" name "ipparam" name
"nodetach" "nodetach"
"logfd" "2"
]; ];
in in

6
tests/pppoe/configuration.nix
View file

@ -25,11 +25,6 @@ in rec {
"PPP_SYNC_TTY" = "y"; "PPP_SYNC_TTY" = "y";
}; };
services.syslogd = longrun {
name = "syslogd";
run = "${pkgs.busybox}/bin/syslogd -n -O /run/syslog";
};
services.pppoe = services.pppoe =
let iface = interface { type = "hardware"; device = "eth0"; }; let iface = interface { type = "hardware"; device = "eth0"; };
in pppoe iface { in pppoe iface {
@ -64,7 +59,6 @@ in rec {
loopback loopback
defaultroute4 defaultroute4
packet_forwarding packet_forwarding
syslogd
]; ];
}; };