dan/liminix
1
0
Fork 5
Code

remove redundant sourcing of ${serviceFns}

Browse Source 
this is done by the oneshot and longrun functions
This commit is contained in:
Daniel Barlow 2024-08-28 21:28:27 +01:00
parent 283c3154a7
commit 7351e143c5
8 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/arhcive.nix
View File

@ -52,7 +52,6 @@ in rec {
dependencies = [ services.dhcpc ]; dependencies = [ services.dhcpc ];
name = "resolvconf"; name = "resolvconf";
up = '' up = ''
. ${serviceFns}
( in_outputs ${name} ( in_outputs ${name}
for i in $(output ${services.dhcpc} dns); do for i in $(output ${services.dhcpc} dns); do
echo "nameserver $i" > resolv.conf echo "nameserver $i" > resolv.conf
@ -93,7 +92,6 @@ in rec {
secrets_file = oneshot rec { secrets_file = oneshot rec {
name = "rsync-secrets"; name = "rsync-secrets";
up = '' up = ''
. ${serviceFns}
(in_outputs ${name} (in_outputs ${name}
echo "backup:${secrets.rsync_secret}" > secrets) echo "backup:${secrets.rsync_secret}" > secrets)
''; '';

1
examples/demo.nix
View File

@ -137,7 +137,6 @@ in rec {
dependencies = [ services.wan ]; dependencies = [ services.wan ];
name = "resolvconf"; name = "resolvconf";
up = '' up = ''
. ${serviceFns}
( in_outputs ${name} ( in_outputs ${name}
echo "nameserver $(output ${services.wan} ns1)" > resolv.conf echo "nameserver $(output ${services.wan} ns1)" > resolv.conf
echo "nameserver $(output ${services.wan} ns2)" >> resolv.conf echo "nameserver $(output ${services.wan} ns2)" >> resolv.conf

2
examples/recovery.nix
View File

@ -60,7 +60,6 @@ in rec {
dependencies = [ services.dhcpc ]; dependencies = [ services.dhcpc ];
name = "resolvconf"; name = "resolvconf";
up = '' up = ''
. ${serviceFns}
( in_outputs ${name} ( in_outputs ${name}
for i in $(output ${services.dhcpc} dns); do for i in $(output ${services.dhcpc} dns); do
echo "nameserver $i" > resolv.conf echo "nameserver $i" > resolv.conf
@ -72,7 +71,6 @@ in rec {
services.growfs = let name = "growfs"; in oneshot { services.growfs = let name = "growfs"; in oneshot {
inherit name; inherit name;
up = '' up = ''
. ${serviceFns}
device=$(grep /persist /proc/1/mountinfo | cut -f9 -d' ') device=$(grep /persist /proc/1/mountinfo | cut -f9 -d' ')
${pkgs.e2fsprogs}/bin/resize2fs $device ${pkgs.e2fsprogs}/bin/resize2fs $device
''; '';

1
modules/dnsmasq/service.nix
View File

@ -26,7 +26,6 @@ longrun {
inherit name; inherit name;
dependencies = [ interface ]; dependencies = [ interface ];
run = '' run = ''
. ${serviceFns}
${dnsmasq}/bin/dnsmasq \ ${dnsmasq}/bin/dnsmasq \
--user=${user} \ --user=${user} \
--domain=${domain} \ --domain=${domain} \

1
modules/network/address.nix
View File

@ -11,7 +11,6 @@ let
# prefixes, or the same but different protocols # prefixes, or the same but different protocols
name = "${interface.name}.a.${address}"; name = "${interface.name}.a.${address}";
up = '' up = ''
. ${serviceFns}
dev=$(output ${interface} ifname) dev=$(output ${interface} ifname)
ip address add ${address}/${toString prefixLength} dev $dev ip address add ${address}/${toString prefixLength} dev $dev
(in_outputs ${name} (in_outputs ${name}

1
modules/profiles/gateway.nix
View File

@ -149,7 +149,6 @@ in {
dependencies = [ config.services.wan ]; dependencies = [ config.services.wan ];
name = "resolvconf"; name = "resolvconf";
up = '' up = ''
. ${serviceFns}
( in_outputs ${name} ( in_outputs ${name}
echo "nameserver $(output ${config.services.wan} ns1)" > resolv.conf echo "nameserver $(output ${config.services.wan} ns1)" > resolv.conf
echo "nameserver $(output ${config.services.wan} ns2)" >> resolv.conf echo "nameserver $(output ${config.services.wan} ns2)" >> resolv.conf

1
modules/profiles/wap.nix
View File

@ -81,7 +81,6 @@ in {
# 'A list of DNS server' but doesn't say what separates the # 'A list of DNS server' but doesn't say what separates the
# list members. Assuming it's a space or other IFS character # list members. Assuming it's a space or other IFS character
up = '' up = ''
. ${serviceFns}
( in_outputs ${name} ( in_outputs ${name}
for i in $(output ${config.services.dhcpc} dns); do for i in $(output ${config.services.dhcpc} dns); do
echo "nameserver $i" > resolv.conf echo "nameserver $i" > resolv.conf

1
modules/secrets/outboard.nix
View File

@ -9,7 +9,6 @@ in longrun {
inherit name; inherit name;
buildInputs = [ json-to-fstree ]; buildInputs = [ json-to-fstree ];
run = '' run = ''
. ${serviceFns}
${optionalString (username != null) '' ${optionalString (username != null) ''
export NETRC=$(mkstate ${name})/netrc export NETRC=$(mkstate ${name})/netrc
(echo default ; echo login ${username} ; echo password ${password} ) > $NETRC (echo default ; echo login ${username} ; echo password ${password} ) > $NETRC