diff options
| author | Tom Gundersen <teg@jklm.no> | 2012-01-30 14:53:14 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2012-01-30 14:53:14 +0100 |
| commit | fe99dfb859174b7f0843b3a5793896811a66accb (patch) | |
| tree | 20dec520292f4f85384c69d91906c7f8ed4dc99f | |
| parent | cc568fb39b8558c9308019c4cfd2215461836890 (diff) | |
| parent | b52fa3010a6f7d9ad99dcc9dfab0a9f9a5434a9b (diff) | |
| download | initscripts-fe99dfb859174b7f0843b3a5793896811a66accb.tar.xz | |
Merge remote-tracking branch 'falconindy/working'
| -rw-r--r-- | functions | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -171,9 +171,14 @@ stat_die() { } status() { + [[ $1 = '-v' ]] && { local v=1; shift; } stat_busy "$1" shift - "$@" &>/dev/null + if (( v )); then + "$@" + else + "$@" &>/dev/null + fi local ret=$? (( ret == 0 )) && stat_done || stat_fail return $ret @@ -353,8 +358,8 @@ udevd_modprobe() { stat_done # Load modules from the MODULES array defined in rc.conf - [[ -f /proc/modules ]] && (( ${#MODULES[*]} )) && - status "Loading User-specified Modules" modprobe -ab "${MODULES[@]}" + (( ${#MODULES[*]} )) && + status -v "Loading User-specified Modules" modprobe -ab "${MODULES[@]}" status "Waiting for UDev uevents to be processed" \ udevadm settle |