From: Daniel Molkentin <dmolkentin@suse.com>
Date: Thu, 18 Jul 2019 08:14:37 +0000 (+0200)
Subject: mkinitrd-suse.sh: simplify get_kernel_version
X-Git-Tag: 050~219
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fdracut.git;a=commitdiff_plain;h=d10f6f8367b7ab0a4332a1264ce0b13c7f4850e6

mkinitrd-suse.sh: simplify get_kernel_version

This generalizes the naming and provides a workaround for compressed
kernels on s390.

Reference: bsc#1139939
---

diff --git a/mkinitrd-suse.sh b/mkinitrd-suse.sh
index 9f3004225..790a2278d 100755
--- a/mkinitrd-suse.sh
+++ b/mkinitrd-suse.sh
@@ -145,31 +145,17 @@ is_xen_kernel() {
     return
 }
 
-# kernel_image_gz_from_image() and kernel_version_from_image() are helpers
-# for arm* kernels which produce zImage files which cannot be read from
-# get_kernel_version -> get rid of this workaround if possible
-kernel_image_gz_from_image() {
-    local arch=$(uname -i)
-    local r=${1}.gz
-
-    # uImage kernels can't be extracted directly. Use the vmlinux.gz instead
-    r=${r//uImage/vmlinux}
-
-    # on ARM a zImage can't be extracted directly. Other platforms define it
-    # as a gzipped vmlinux file, but not ARM. So only on ARM, use vmlinux.gz.
-    if [[ $arch =~ arm ]] || [[ $arch =~ aarch ]]; then
-        r=${r//zImage/vmlinux}
-    fi
-
-    echo $r
-}
-
 kernel_version_from_image() {
-    local kernel_image="$1" kernel_image_gz=$(kernel_image_gz_from_image "$1")
-
-    if get_kernel_version "$kernel_image" 2>/dev/null; then
-        return
-    fi
+    local dir="${1%/*}/"                                                                                             |
+    [[ "$dir" != "$1" ]] || dir=""                                                                                   |
+    local kernel_image="$1" kernel_image_gz="${dir}vmlinux-${1#*-}.gz"                                               |
+    echo kernel_image_gz="'$kernel_image_gz'" >&2                                                                    |
+                                                                                                                     |
+    if get_kernel_version "$kernel_image" 2>/dev/null; then                                                          |
+        return                                                                                                       |
+    fi                                                                                                               |
+                                                                                                                     |
+    # As a last resort, try vmlinux-$version.gz, which might be around                                               |
     get_kernel_version "$kernel_image_gz" 2>/dev/null
 }