dkms: do_uninstall: restore archived modules to recorded location

Fixes: dell#480

Author: anbe42

dkms.in

@@ -1888,9 +1888,33 @@ do_uninstall()
             else
                 echo "Module $m$module_suffix was not found within $install_tree/$1/"
             fi
+            if [[ -d $original_module_backup_dir ]]; then
+                local origin_file
+                while IFS= read -r origin_file
+                do
+                    [[ $origin_file ]] || continue
+                    local original_module
+                    original_module=${origin_file%.origin}
+                    [[ -f $original_module ]] || continue
+                    local original_location
+                    original_location=$(head -n 1 "$origin_file")
+                    case $original_location in
+                        "$install_tree/$1/"*)
+                            echo "Restoring archived original module $original_location"
+                            mkdir -p "${original_location%/*}"
+                            mv -f "$original_module" "$original_location"
+                            rm -f "$origin_file"
+                            ;;
+                        *)  warn "Bad original location '$original_location' in $origin_file"
+                            ;;
+                    esac
+                done <<< "$(find "$original_module_backup_dir" -type f -name "$m.*.origin")"
+                find "${original_module_backup_dir%/*}" -type d -empty -delete
+            fi
             local origmod
             origmod=$(compressed_or_uncompressed "$original_module_backup_dir" "$m")
             if [[ -n $origmod ]]; then
+                # Module was archived by older dkms versions without creating .origin
                 echo "Restoring archived original module"
                 mkdir -p "$install_tree/$1${DEST_MODULE_LOCATION[$count]}/"
                 mv -f "$origmod" "$install_tree/$1${DEST_MODULE_LOCATION[$count]}/" 2>/dev/null

run_test.sh

@@ -1855,20 +1855,9 @@ run_with_expected_output dkms unbuild -k "${KERNEL_VER}" -m dkms_replace_test -v
 Module dkms_replace_test/2.0 for kernel ${KERNEL_VER} (${KERNEL_ARCH}):
 Before uninstall, this module version was ACTIVE on this kernel.
 Deleting /lib/modules/${KERNEL_VER}/${expected_dest_loc}/dkms_test.ko${mod_compression_ext}
-Restoring archived original module
-Running depmod... done.
-Removing original module(s) from DKMS tree for kernel ${KERNEL_VER} (${KERNEL_ARCH})
-EOF
-if [ "${expected_dest_loc}" != "kernel/extra" ]; then
-    # A replaced module originating from a kernel image should get restored
-    # to its original location, but since we are testing with a dkms module
-    # (installed to a dynamic location), this may not happen.
-    echo 'Moving the restored module back to its correct location (testing artefact)'
-    mkdir -p "/lib/modules/${KERNEL_VER}/${expected_dest_loc}"
-    mv  "/lib/modules/${KERNEL_VER}/kernel/extra/dkms_test.ko${mod_compression_ext}" \
-        "/lib/modules/${KERNEL_VER}/${expected_dest_loc}/dkms_test.ko${mod_compression_ext}"
-    rmdir --ignore-fail-on-non-empty "/lib/modules/${KERNEL_VER}/kernel/extra" "/lib/modules/${KERNEL_VER}/kernel"
-fi
+Restoring archived original module /lib/modules/${KERNEL_VER}/${expected_dest_loc}/dkms_test.ko${mod_compression_ext}
+Running depmod... done.
+EOF
 run_status_with_expected_output 'dkms_replace_test' << EOF
 dkms_replace_test/2.0: added
 EOF
@@ -1910,19 +1899,11 @@ run_with_expected_output dkms remove -k "${KERNEL_VER}" -m dkms_replace_test -v
 Module dkms_replace_test/2.0 for kernel ${KERNEL_VER} (${KERNEL_ARCH}):
 Before uninstall, this module version was ACTIVE on this kernel.
 Deleting /lib/modules/${KERNEL_VER}/${expected_dest_loc}/dkms_test.ko${mod_compression_ext}
-Restoring archived original module
+Restoring archived original module /lib/modules/${KERNEL_VER}/${expected_dest_loc}/dkms_test.ko${mod_compression_ext}
 Running depmod... done.
-Removing original module(s) from DKMS tree for kernel ${KERNEL_VER} (${KERNEL_ARCH})
 
 Deleting module dkms_replace_test/2.0 completely from the DKMS tree.
 EOF
-if [ "${expected_dest_loc}" != "kernel/extra" ]; then
-    echo 'Moving the restored module back to its correct location (testing artefact)'
-    mkdir -p "/lib/modules/${KERNEL_VER}/${expected_dest_loc}"
-    mv  "/lib/modules/${KERNEL_VER}/kernel/extra/dkms_test.ko${mod_compression_ext}" \
-        "/lib/modules/${KERNEL_VER}/${expected_dest_loc}/dkms_test.ko${mod_compression_ext}"
-    rmdir --ignore-fail-on-non-empty "/lib/modules/${KERNEL_VER}/kernel/extra" "/lib/modules/${KERNEL_VER}/kernel"
-fi
 run_status_with_expected_output 'dkms_replace_test' << EOF
 EOF
 run_status_with_expected_output 'dkms_test' << EOF