nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #316911 from NixOS/backport-312317-to-release-24.05

Browse Source 
[Backport release-24.05] nixos/network-interfaces: prevent failure when a network address already exists
This commit is contained in:
Michele Guerini Rocco 2024-06-03 17:58:46 +02:00 committed by GitHub
commit 92706b2141
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/tasks/network-interfaces-scripted.nix
View File

@ -203,10 +203,10 @@ let
''
echo "${cidr}" >> $state
echo -n "adding address ${cidr}... "
if out=$(ip addr add "${cidr}" dev "${i.name}" 2>&1); then
if out=$(ip addr replace "${cidr}" dev "${i.name}" 2>&1); then
echo "done"
elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
echo "'ip addr add "${cidr}" dev "${i.name}"' failed: $out"
else
echo "'ip addr replace "${cidr}" dev "${i.name}"' failed: $out"
exit 1
fi
''