Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-01-08 10:26:40 -08:00
parent 10dbda27b6 dfa2ea2c09
commit 536420cf32
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/common.sh
View File

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