Adding upstream version 1.110.1.

[live-boot-grml.git] / scripts / live-premount / 10driver_updates

diff --git a/scripts/live-premount/10driver_updates b/scripts/live-premount/10driver_updates
index 22d64d2..eda8bbf 100755 (executable)
--- a/scripts/live-premount/10driver_updates
+++ b/scripts/live-premount/10driver_updates
@@ -41,20 +41,25 @@ is_updates_path ()
        # kernel flavour.
 
        path=${1}
-       kbase=$(uname -r | sed 's/^\([0-9]*\.[0-9]*\.[0-9]*\)-.*/\1/')
-       update_dir="${path}/ubuntu-drivers/${kbase}"
+       abi="$(uname -r)"
+       kver="$(echo "$abi" | cut -d- -f1,2)"
+       kbase="$(echo "$abi" | cut -d- -f1)"
+
+       for leaf in "$abi" "$kver" "$kbase"
+       do
+               update_dir="$path/ubuntu-drivers/$leaf"
+
+               [ -d "$update_dir" ] || continue
 
-       if [ -d "${update_dir}" ]
-       then
                if [ "$(echo ${update_dir}/*_${DPKG_ARCH}.deb)" != \
                        "${update_dir}/*_${DPKG_ARCH}.deb" ]
                then
                        echo "${update_dir}"
-                       return 0;
+                       return 0
                fi
-       fi
+       done
 
-       return 1;
+       return 1
 }
 
 is_nice_device ()