dan/liminix
1
0
Fork 5
Code

provide stdout to ppp callback scripts

Browse Source 
pppd runs them with 0,1,2 => /dev/null but we actually quite like
seeing errors in the logs
This commit is contained in:
Daniel Barlow 2024-10-17 21:37:08 +01:00
parent 1bca072509
commit 1f7d6544e3
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/ppp/common.nix
View File

@ -15,25 +15,26 @@ let
inherit (builtins) toJSON toString typeOf; inherit (builtins) toJSON toString typeOf;
ip-up = writeAshScript "ip-up" {} '' ip-up = writeAshScript "ip-up" {} ''
exec >&5 2>&5
. ${serviceFns} . ${serviceFns}
(in_outputs ${name} in_outputs ${name}
echo $1 > ifname echo $1 > ifname
echo $2 > tty echo $2 > tty
echo $3 > speed echo $3 > speed
echo $4 > address echo $4 > address
echo $5 > peer-address echo $5 > peer-address
echo $DNS1 > ns1 set +o nounset
echo $DNS2 > ns2 if test -n "''${DNS1}" ;then echo ''${DNS1} > ns1 ; fi
) if test -n "''${DNS2}" ;then echo ''${DNS2} > ns2 ; fi
echo >/proc/self/fd/10 test -e ipv6-address && echo >/proc/self/fd/10
''; '';
ip6-up = writeAshScript "ip6-up" {} '' ip6-up = writeAshScript "ip6-up" {} ''
exec >&5 2>&5
. ${serviceFns} . ${serviceFns}
(in_outputs ${name} in_outputs ${name}
echo $4 > ipv6-address echo $4 > ipv6-address
echo $5 > ipv6-peer-address echo $5 > ipv6-peer-address
) test -e ifname && echo >/proc/self/fd/10
test -e tty && echo >/proc/self/fd/10
''; '';
literal_or_output = literal_or_output =
let v = o: ({ let v = o: ({
@ -72,6 +73,7 @@ let
chmod 0700 /run/${name} chmod 0700 /run/${name}
in_outputs ${name} in_outputs ${name}
echo ${escapeShellArgs ppp-options'} | ${output-template}/bin/output-template '{{' '}}' > /run/${name}/ppp-options echo ${escapeShellArgs ppp-options'} | ${output-template}/bin/output-template '{{' '}}' > /run/${name}/ppp-options
fdmove -c 5 2 \
${command} ${command}
''; '';
notification-fd = 10; notification-fd = 10;