summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2017-01-15 19:53:53 +0300
committerGitHub <noreply@github.com>2017-01-15 19:53:53 +0300
commit3eafa26d75d0401d2484fbcba731a31751c82ad6 (patch)
treef17b66f5ab60414cd4da0896dbd2e45477525915 /nixos
parent70a662884895a079672a7daa57200d2848b80550 (diff)
parent6dbcf7d2e93eb204fd468ca540c37350b97051ea (diff)
downloadnixpkgs-3eafa26d75d0401d2484fbcba731a31751c82ad6.tar
nixpkgs-3eafa26d75d0401d2484fbcba731a31751c82ad6.tar.gz
nixpkgs-3eafa26d75d0401d2484fbcba731a31751c82ad6.tar.bz2
nixpkgs-3eafa26d75d0401d2484fbcba731a31751c82ad6.tar.lz
nixpkgs-3eafa26d75d0401d2484fbcba731a31751c82ad6.tar.xz
nixpkgs-3eafa26d75d0401d2484fbcba731a31751c82ad6.tar.zst
nixpkgs-3eafa26d75d0401d2484fbcba731a31751c82ad6.zip
Merge pull request #21828 from abbradar/hwdb-verify
udev service: verify that hwdb is generated without errors
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/hardware/udev.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 14d65978c32..028907693a5 100644
--- 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
     '';