Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent

This commit is contained in:
Brian Behlendorf 2010-01-08 10:25:57 -08:00
commit 5fbb4d03a5
1 changed files with 8 additions and 2 deletions

View File

@ -44,6 +44,7 @@ RMMOD=${RMMOD:-/sbin/rmmod}
INFOMOD=${INFOMOD:-/sbin/modinfo}
LOSETUP=${LOSETUP:-/sbin/losetup}
SYSCTL=${SYSCTL:-/sbin/sysctl}
UDEVADM=${UDEVADM:-/sbin/udevadm}
die() {
echo -e "${PROG}: $1" >&2
@ -210,8 +211,13 @@ udev_setup() {
cp -f ${SRC_PATH} ${DST_PATH}
udevadm trigger
udevadm settle
if [ -f ${UDEVADM} ]; then
${UDEVADM} trigger
${UDEVADM} settle
else
/sbin/udevtrigger
/sbin/udevsettle
fi
return 0
}