summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/udev
diff options
context:
space:
mode:
authorKen Sharp <ken.sharp@ni.com>2015-04-21 10:35:45 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-28 07:55:59 +0100
commitaf911b272ded95884079dc307eeeb1811f0584c9 (patch)
tree39d66838c4354a8799389bc4776df7c8f884f15f /meta/recipes-core/udev
parentd18e1964dede530c5fae6ae349d6a78fa5342382 (diff)
downloadopenembedded-core-contrib-af911b272ded95884079dc307eeeb1811f0584c9.tar.gz
openembedded-core-contrib-af911b272ded95884079dc307eeeb1811f0584c9.tar.bz2
openembedded-core-contrib-af911b272ded95884079dc307eeeb1811f0584c9.zip
udev-cache: improve error handling
If an error occurs while the udev cache is being populated, the system is left in a state where udev is stopped. Remedy this with a clean up function to restart udev and remove any intermediate files. Signed-off-by: Ken Sharp <ken.sharp@ni.com> Reviewed-by: Ben Shelton <ben.shelton@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/udev')
-rw-r--r--meta/recipes-core/udev/udev/udev-cache8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-core/udev/udev/udev-cache b/meta/recipes-core/udev/udev/udev-cache
index 12f68fb825..dcfff1cb45 100644
--- a/meta/recipes-core/udev/udev/udev-cache
+++ b/meta/recipes-core/udev/udev/udev-cache
@@ -51,9 +51,15 @@ fi
[ "${VERBOSE}" == "no" ] || echo "found."
echo "Populating dev cache"
+err_cleanup () {
+ echo "udev-cache: update failed!"
+ udevadm control --start-exec-queue
+ rm -f -- "$SYSCONF_TMP" "$DEVCACHE_TMP" "$DEVCACHE" "$SYSCONF_CACHED"
+}
+
(
set -e
- trap 'echo "udev-cache: update failed!"' EXIT
+ trap 'err_cleanup' EXIT
udevadm control --stop-exec-queue
sysconf_cmd > "$SYSCONF_TMP"
find /dev -xdev \( -type b -o -type c -o -type l \) | cut -c 2- \