c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 03:09:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve zfs.sh error messages

Browse Source 
Ensure an error message is logged when the 'zfs.sh' script fails
to either load a module or if udev fails to create the /dev/zfs
device.  Error messages for missing KERNEL_MODULES are suppressed
because that functionality may just be built-in to the kernel.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf 2014-04-10 10:44:00 -07:00
parent 6ac770b196
commit 443c3f7332
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/common.sh.in
View File

@ -207,7 +207,11 @@ load_module() {
echo "Loading ${NAME} ($@)" echo "Loading ${NAME} ($@)"
fi fi
${LDMOD} $* &>/dev/null || ERROR="Failed to load $1" return 1 ${LDMOD} $* &>/dev/null
if [ $? -ne 0 ]; then
echo "Failed to load ${NAME} ($@)"
return 1
fi
return 0 return 0
} }
@ -216,7 +220,7 @@ load_modules() {
mkdir -p /etc/zfs mkdir -p /etc/zfs
for MOD in ${KERNEL_MODULES[*]}; do for MOD in ${KERNEL_MODULES[*]}; do
load_module ${MOD} load_module ${MOD} >/dev/null
done done
for MOD in ${MODULES[*]}; do for MOD in ${MODULES[*]}; do

4
scripts/zfs.sh
View File

@ -72,8 +72,8 @@ if [ ${UNLOAD} ]; then
else else
stack_clear stack_clear
check_modules || die "${ERROR}" check_modules || die "${ERROR}"
load_modules "$@" load_modules "$@" || die "Failed to load modules"
wait_udev /dev/zfs 30 wait_udev /dev/zfs 30 || die "'/dev/zfs' was not created"
fi fi
exit 0 exit 0