summary refs log tree commit diff
path: root/nixos/modules/tasks
diff options
context:
space:
mode:
authorMatthew Justin Bauer <mjbauer95@gmail.com>2018-04-08 21:27:38 -0500
committerGitHub <noreply@github.com>2018-04-08 21:27:38 -0500
commit9c66871784081e03500dd7c9c0f15662ddf0f7c5 (patch)
tree2af2024fa1098312e9a2bb8a51865cb6b8ee3c19 /nixos/modules/tasks
parent0528e1870050becf9806ae52fe20b68a830cd6da (diff)
parenta6c8e48840cf1f9e01447ad731c0de53251da05c (diff)
downloadnixlib-9c66871784081e03500dd7c9c0f15662ddf0f7c5.tar
nixlib-9c66871784081e03500dd7c9c0f15662ddf0f7c5.tar.gz
nixlib-9c66871784081e03500dd7c9c0f15662ddf0f7c5.tar.bz2
nixlib-9c66871784081e03500dd7c9c0f15662ddf0f7c5.tar.lz
nixlib-9c66871784081e03500dd7c9c0f15662ddf0f7c5.tar.xz
nixlib-9c66871784081e03500dd7c9c0f15662ddf0f7c5.tar.zst
nixlib-9c66871784081e03500dd7c9c0f15662ddf0f7c5.zip
Merge pull request #38094 from volth/patch-120
nixos/network-scripted: print error details
Diffstat (limited to 'nixos/modules/tasks')
-rw-r--r--nixos/modules/tasks/network-interfaces-scripted.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index c7d56790fa0c..e754a1e8718d 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -191,7 +191,7 @@ let
                     if out=$(ip addr add "${cidr}" dev "${i.name}" 2>&1); then
                       echo "done"
                     elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
-                      echo "failed"
+                      echo "'ip addr add "${cidr}" dev "${i.name}"' failed: $out"
                       exit 1
                     fi
                   ''
@@ -212,7 +212,7 @@ let
                      if out=$(ip route add "${cidr}" ${options} ${via} dev "${i.name}" 2>&1); then
                        echo "done"
                      elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
-                       echo "failed"
+                       echo "'ip route add "${cidr}" ${options} ${via} dev "${i.name}"' failed: $out"
                        exit 1
                      fi
                   ''