Improve zfs.sh error messages

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>

diff --git a/scripts/common.sh.in b/scripts/common.sh.in
index a6586f4aa9ecdc3ed297827a2aeb2073a0e0ed6e..2fac2a9191c2df00b4b506bd4aa5c9d0366cd041 100644 (file)
--- a/scripts/common.sh.in
+++ b/scripts/common.sh.in
@@ -207,7 +207,11 @@ load_module() {
                echo "Loading ${NAME} ($@)"
        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
 }
@@ -216,7 +220,7 @@ load_modules() {
        mkdir -p /etc/zfs
 
        for MOD in ${KERNEL_MODULES[*]}; do
-               load_module ${MOD}
+               load_module ${MOD} >/dev/null
        done
 
        for MOD in ${MODULES[*]}; do

diff --git a/scripts/zfs.sh b/scripts/zfs.sh
index b21d2e7cf596c8296ebc94f33b788baafdd893bb..b97a0577ff8ac016b389ddff40c6abe79f1de175 100755 (executable)
--- a/scripts/zfs.sh
+++ b/scripts/zfs.sh
@@ -72,8 +72,8 @@ if [ ${UNLOAD} ]; then
 else
        stack_clear
        check_modules || die "${ERROR}"
-       load_modules "$@"
-       wait_udev /dev/zfs 30
+       load_modules "$@" || die "Failed to load modules"
+       wait_udev /dev/zfs 30 || die "'/dev/zfs' was not created"
 fi
 
 exit 0