File kdump-56814cf5d03dff1d6233de996e79e1dd54cf5144 of Package kdump

Overview Repositories Revisions Requests Users Attributes Meta

File kdump-56814cf5d03dff1d6233de996e79e1dd54cf5144 of Package kdump (Revision 3a09799e6ddbd007d8924a7af447602d)

Currently displaying revision 3a09799e6ddbd007d8924a7af447602d , Show latest

# HG changeset patch
# User Bernhard Walle <bwalle@suse.de>
# Date 1225046677 -3600
# Node ID 56814cf5d03dff1d6233de996e79e1dd54cf5144
# Parent  ab17d673947837b991853adf412862a67e8862b6
boot.kdump: Use the full kernel release for initrd name

Use the full kernel release (obtained with /sbin/get_kernel_version) to build
the initrd name also when symlinks are used.

diff -r ab17d6739478 -r 56814cf5d03d ChangeLog
--- a/ChangeLog	Sun Oct 26 17:06:56 2008 +0100
+++ b/ChangeLog	Sun Oct 26 19:44:37 2008 +0100
@@ -1,3 +1,9 @@
+2008-10-26  Bernhard Walle <bwalle@suse.de>
+
+	* boot.kdump: Use the full kernel release (obtained with
+	  /sbin/get_kernel_version) to build the initrd name also when symlinks
+	  are used.
+
 2008-10-22  Bernhard Walle <bwalle@suse.de>
 
 	* actually check <version>-kdump before <version>-<flavour> when
diff -r ab17d6739478 -r 56814cf5d03d NEWS
--- a/NEWS	Sun Oct 26 17:06:56 2008 +0100
+++ b/NEWS	Sun Oct 26 19:44:37 2008 +0100
@@ -3,6 +3,9 @@
   * change default location for KDUMP_SAVEDIR to "/var/crash"
   * actually check <version>-kdump before <version>-<flavour> when looking for
     a suitable kdump kernel
+  * boot.kdump: Use the full kernel release (obtained with
+    /sbin/get_kernel_version) to build the initrd name also when symlinks are
+    used.
 
 0.6.3
 -----
diff -r ab17d6739478 -r 56814cf5d03d init/boot.kdump
--- a/init/boot.kdump	Sun Oct 26 17:06:56 2008 +0100
+++ b/init/boot.kdump	Sun Oct 26 19:44:37 2008 +0100
@@ -158,18 +158,31 @@
 }
 
 #
-# Returns the initrd for the kernel. If the kernel already contains
+# Prints the initrd for the kernel. If the kernel already contains
 # "kdump", then return "/boot/initrd-<kernelver>", else return
 # "/boot/initrd-<kernelver>-kdump".
+#
+# @param kdump_kernel: Full path to the kernel
+# @returncode: 0 on success, 1 on failure
 function find_initrd ()
 {
-    local kdump_kver=$1
+    local kdump_kernel=$1
+
+    # canonicalize the kernel version
+    local kdump_kver=$(/sbin/get_kernel_version "$kdump_kernel")
+    if [ -z "$kdump_kver" ] ; then
+        echo >&2 "Getting version for $kdump_kernel failed."
+        echo "${BOOTDIR}/initrd-kdump"
+        return 1
+    fi
 
     if [[ "$kdump_kver" == *kdump* ]] ; then
-        echo "${BOOTDIR}/initrd${kdump_kver}"
+        echo "${BOOTDIR}/initrd${kdump_kver:+-}${kdump_kver}"
     else
         echo "${BOOTDIR}/initrd${kdump_kver:+-}${kdump_kver}-kdump"
     fi
+
+    return 0
 }
 
 #
@@ -240,7 +253,7 @@
         rc_exit
     fi
 
-    kdump_initrd=$(find_initrd "$kdump_kver")
+    kdump_initrd=$(find_initrd "$kdump_kernel")
 
     # rebuilding the kdump initramfs if necessary
     mkdumprd -K "$kdump_kernel" -I "$kdump_initrd" -q

Places

File kdump-56814cf5d03dff1d6233de996e79e1dd54cf5144 of Package kdump (Revision 3a09799e6ddbd007d8924a7af447602d)

Places