Merge pull request #21828 from abbradar/hwdb-verify

udev service: verify that hwdb is generated without errors
2017-01-15 19:53:53 +03:00 · 2017-01-15 19:53:53 +03:00 · 3eafa26d75
commit 3eafa26d75
parent 70a6628848 6dbcf7d2e9
1 changed files with 4 additions and 1 deletions
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@ -143,7 +143,10 @@ let
      done

      echo "Generating hwdb database..."
-      ${udev}/bin/udevadm hwdb --update --root=$(pwd)
+      # hwdb --update doesn't return error code even on errors!
+      res="$(${udev}/bin/udevadm hwdb --update --root=$(pwd) 2>&1)"
+      echo "$res"
+      [ -z "$(echo "$res" | egrep '^Error')" ]
      mv etc/udev/hwdb.bin $out
    '';