Index: dkms-2.0.19/dkms_autoinstaller =================================================================== --- dkms-2.0.19/dkms_autoinstaller +++ dkms-2.0.19/dkms_autoinstaller 2015-11-23 08:09:42.173201544 -0500 @@ -22,27 +22,26 @@ { local exitval=0 local exitval_file=`mktemp /tmp/dkms.XXXXXX` - [ -z "$verbose" ] && echo -en "$2..." >$output_loc || echo -e "$1" >$output_loc + [ -z "$verbose" ] && echo -en "$2..." || echo -e "$1" if [ "$3" == background ] && [ -z "$verbose" ]; then (eval $1 >/dev/null 2>&1; echo "exitval=$?" >> "$exitval_file") & while [ -e "$exitval_file" ] && ! [ -s "$exitval_file" ]; do sleep 3 - echo -en "." >$output_loc + echo -en "." done . "$exitval_file" else eval $1; exitval=$? fi - [ $exitval -gt 0 ] && echo -en "(bad exit status: $exitval)" >$output_loc + [ $exitval -gt 0 ] && echo -en "(bad exit status: $exitval)" rm -f "$exitval_file" - echo -en "\n" >$output_loc + echo -en "\n" return $exitval } # Set Variables -output_loc="/dev/stdout" -[ -n "$2" ] && kernel=$2 && output_loc="/dev/stdout" || kernel=`uname -r` +[ -n "$2" ] && kernel=$2 || kernel=`uname -r` #kernelver_rpm=`rpm -qf "/lib/modules/$kernel" 2>/dev/null | grep -v "not owned by any package" | grep kernel | head -1` [ `uname -m` == "x86_64" ] && [ `cat /proc/cpuinfo | grep -c "Intel"` -gt 0 ] && [ `ls $install_tree/$kernel/build/configs 2>/dev/null | grep -c "ia32e"` -gt 0 ] && arch="ia32e" || arch=`uname -m` [[ $arch = i?86 ]] && arch=i586 @@ -53,7 +52,7 @@ # See how we were called. case "$1" in start) - echo "" >$output_loc + echo "" for filename in `ls "$dkms_tree"`; do if [ -d "$dkms_tree/$filename" ] && ! [ -h "$dkms_tree/$filename" ]; then @@ -92,38 +91,38 @@ # Based on what we know, either do it or not if [ -n "$already_installed" ]; then - echo "$module_in_tree ($already_installed_version): Already installed on this kernel." >$output_loc + echo "$module_in_tree ($already_installed_version): Already installed on this kernel." elif [ -z "$do_autoinstall" ]; then - echo "$module_in_tree ($version_in_tree): AUTOINSTALL not set in its dkms.conf." >$output_loc + echo "$module_in_tree ($version_in_tree): AUTOINSTALL not set in its dkms.conf." elif [ -n "$do_autoinstall" ] && [ "$version_count" -gt 1 ]; then - echo "$module_in_tree: Multiple versions in DKMS. Unsure what to do. Resolve manually." >$output_loc + echo "$module_in_tree: Multiple versions in DKMS. Unsure what to do. Resolve manually." else - echo "$module_in_tree ($version_in_tree): Installing module." >$output_loc + echo "$module_in_tree ($version_in_tree): Installing module." if [ "$current_state" != "built" ] && ! [ -e /lib/modules/$kernel/build/include ]; then - echo " Kernel devel files for $kernel not installed. Cannot install this module." >$output_loc + echo " Kernel devel files for $kernel not installed. Cannot install this module." elif [ "$current_state" != "built" ] && [ -e /lib/modules/$kernel/build/include ]; then return_status="" if [ -z "$kernel_preparation_done" ]; then - invoke_command "dkms build -m $module_in_tree -v $version_in_tree -k $kernel -a $arch -q --no-clean-kernel >$output_loc" "." background + invoke_command "dkms build -m $module_in_tree -v $version_in_tree -k $kernel -a $arch -q --no-clean-kernel " "." background return_status="$?" kernel_preparation_done="true" else - invoke_command "dkms build -m $module_in_tree -v $version_in_tree -k $kernel -a $arch --no-prepare-kernel --no-clean-kernel -q >$output_loc" "." background + invoke_command "dkms build -m $module_in_tree -v $version_in_tree -k $kernel -a $arch --no-prepare-kernel --no-clean-kernel -q " "." background return_status="$?" fi if [ "$return_status" -eq 0 ]; then - invoke_command "dkms install -m $module_in_tree -v $version_in_tree -k $kernel -a $arch -q >$output_loc" "." background + invoke_command "dkms install -m $module_in_tree -v $version_in_tree -k $kernel -a $arch -q " "." background else - echo " Build failed. Installation skipped." >$output_loc + echo " Build failed. Installation skipped." fi else - invoke_command "dkms install -m $module_in_tree -v $version_in_tree -k $kernel -a $arch -q >$output_loc" "." background + invoke_command "dkms install -m $module_in_tree -v $version_in_tree -k $kernel -a $arch -q " "." background return_status=$? if [ "$return_status" -eq 101 ]; then - echo " A newer module version than this already exists in this kernel." >$output_loc - echo " Skipping install... (you can manually install later with --force)" >$output_loc + echo " A newer module version than this already exists in this kernel." + echo " Skipping install... (you can manually install later with --force)" elif [ "$return_status" -ne 0 ]; then - echo " Installation failed!" >$output_loc + echo " Installation failed!" fi fi fi