movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-12 05:16:25 +03:00
Code Activity

nixos/networking: check interface state files exist before acting on them

Browse source 
Fix #89158
This commit is contained in:
datafoo 2020-05-29 12:20:06 +02:00
parent d9f9fcfd16
commit 8f16f66b27
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/tasks/network-interfaces-scripted.nix
View file

@ -232,18 +232,22 @@ let
''; '';
preStop = '' preStop = ''
state="/run/nixos/network/routes/${i.name}" state="/run/nixos/network/routes/${i.name}"
if [ -e "$state" ]; then
while read cidr; do while read cidr; do
echo -n "deleting route $cidr... " echo -n "deleting route $cidr... "
ip route del "$cidr" dev "${i.name}" >/dev/null 2>&1 && echo "done" || echo "failed" ip route del "$cidr" dev "${i.name}" >/dev/null 2>&1 && echo "done" || echo "failed"
done < "$state" done < "$state"
rm -f "$state" rm -f "$state"
fi
state="/run/nixos/network/addresses/${i.name}" state="/run/nixos/network/addresses/${i.name}"
if [ -e "$state" ]; then
while read cidr; do while read cidr; do
echo -n "deleting address $cidr... " echo -n "deleting address $cidr... "
ip addr del "$cidr" dev "${i.name}" >/dev/null 2>&1 && echo "done" || echo "failed" ip addr del "$cidr" dev "${i.name}" >/dev/null 2>&1 && echo "done" || echo "failed"
done < "$state" done < "$state"
rm -f "$state" rm -f "$state"
fi
''; '';
}; };