more autoinstall etc. tests

.gitignore

@@ -1,9 +1,16 @@
 /dist
 dkms
 dkms.8
+dkms.bash-completion
+dkms.zsh-completion
+dkms_framework.conf
 dkms_autoinstaller
 dkms.service
-kernel_install.d_dkms
-kernel_postinst.d_dkms
+dkms_common.postinst
+debian_kernel_install.d
+debian_kernel_postinst.d
+debian_kernel_prerm.d
+redhat_kernel_install.d
+
 test_cmd_expected_output.log
 test_cmd_output.log

Makefile

@@ -29,7 +29,7 @@ SED_SUBSTITUTIONS	 = \
 %: %.in
 	$(SED) $(SED_SUBSTITUTIONS) $< > $@
 
-all: \
+GENERATED= \
 	dkms \
 	dkms.8 \
 	dkms_autoinstaller \
@@ -43,20 +43,11 @@ all: \
 	debian_kernel_prerm.d \
 	redhat_kernel_install.d
 
+all: $(GENERATED)
+
 clean:
 	-rm -rf dist/
-	-rm -f dkms
-	-rm -f dkms.8
-	-rm -f dkms_autoinstaller
-	-rm -f dkms.bash-completion
-	-rm -f dkms.zsh-completion
-	-rm -f dkms_common.postinst
-	-rm -f dkms_framework.conf
-	-rm -f dkms.service
-	-rm -f debian_kernel_install.d
-	-rm -f debian_kernel_postinst.d
-	-rm -f debian_kernel_prerm.d
-	-rm -f redhat_kernel_install.d
+	$(RM) $(GENERATED)
 
 install: all
 	$(if $(strip $(VAR)),$(error Setting VAR is not supported))

dkms.in

@@ -363,11 +363,11 @@ check_all_is_banned()
 
 # A little test function for DKMS commands that only work on one kernel.
 have_one_kernel() {
+    check_all_is_banned $1
     if (( ${#kernelver[@]} != 1 )); then
         [[ $1 =~ kernel_(postinst|prerm) ]] && die 4 "The action $1 requires exactly one kernel version parameter on the command line."
         die 4 "The action $1 does not support multiple kernel version parameters on the command line."
     fi
-    check_all_is_banned $1
 }
 
 # Set up the kernelver and arch arrays.  You must have a 1:1 correspondence --
@@ -2956,6 +2956,7 @@ add | build | install)
     ${action}_module
     ;;
 autoinstall)
+    have_one_kernel $action
     check_root && autoinstall
     ;;
 match)

dkms_autoinstaller.in

@@ -17,45 +17,24 @@
 ### END INIT INFO
 
 
-if [ -f /lib/lsb/init-functions ]; then
-    . /lib/lsb/init-functions
-elif [ -f /etc/rc.d/init.d/functions ]; then
-    . /etc/rc.d/init.d/functions
-fi
-
 exec="@SBINDIR@/dkms"
-prog=${exec##*/}
+MODDIR="@MODDIR@"
 
 test -f $exec || exit 0
 
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-
-uname_s=$(uname -s)
-
-_get_kernel_dir() {
-    KVER=$1
-    DIR="@MODDIR@/$KVER/build"
-    echo $DIR
-}
-
-_check_kernel_dir() {
-    DIR=$(_get_kernel_dir $1)
-    test -e $DIR/include
-    return $?
-}
-
 case "$1" in
     start)
 		if [ -n "$2" ]; then
 			kernel="$2"
 		else
 			kernel=$(uname -r)
 		fi
-		if ! _check_kernel_dir $kernel; then
+		if [ ! -d "$MODDIR/$kernel/build/include" ]; then
 			echo "Automatic installation of modules for kernel $kernel was skipped since the kernel headers for this kernel do not seem to be installed."
 		else
 			dkms autoinstall --kernelver $kernel
 			res=$?
+			test $res = 0
 		fi
 		;;
 	stop|restart|force-reload|status|reload)