Hi,

I have uploaded a fixed version to DELAYED/1 with the attached fix.

Cheers,
Balint
diff -Nru kexec-tools-2.0.7/debian/changelog kexec-tools-2.0.7/debian/changelog
--- kexec-tools-2.0.7/debian/changelog	2014-11-24 15:35:55.000000000 +0100
+++ kexec-tools-2.0.7/debian/changelog	2015-04-22 12:06:28.000000000 +0200
@@ -1,3 +1,11 @@
+kexec-tools (1:2.0.7-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Don't reboot the machine while removing the package (Closes: #782033)
+  * Fix loading kdump kernel on i386 (Closes: #771671)
+
+ -- Balint Reczey <bal...@balintreczey.hu>  Wed, 22 Apr 2015 12:04:44 +0200
+
 kexec-tools (1:2.0.7-5) unstable; urgency=medium
 
   * Deleted the extra "-x" from "#!/bin/sh -x" in kexec-load init
diff -Nru kexec-tools-2.0.7/debian/kexec-load.init.d kexec-tools-2.0.7/debian/kexec-load.init.d
--- kexec-tools-2.0.7/debian/kexec-load.init.d	2014-11-24 05:02:10.000000000 +0100
+++ kexec-tools-2.0.7/debian/kexec-load.init.d	2015-04-22 12:04:36.000000000 +0200
@@ -109,6 +109,9 @@
 			exit 0
 		fi
 	fi
+	if [ -x /sbin/runlevel -a "$(runlevel | awk '{ print $2 }')" != "6" ]; then 
+		exit 0
+	fi
 	do_stop
 	;;
   *)
diff -Nru kexec-tools-2.0.7/debian/patches/fix-callback-functions-given-to-kexec_iomem_for_each_line.patch kexec-tools-2.0.7/debian/patches/fix-callback-functions-given-to-kexec_iomem_for_each_line.patch
--- kexec-tools-2.0.7/debian/patches/fix-callback-functions-given-to-kexec_iomem_for_each_line.patch	1970-01-01 01:00:00.000000000 +0100
+++ kexec-tools-2.0.7/debian/patches/fix-callback-functions-given-to-kexec_iomem_for_each_line.patch	2015-04-22 11:59:37.000000000 +0200
@@ -0,0 +1,44 @@
+Description: Fix callback functions given to kexec_iomem_for_each_line
+Author: Bernhard Übelacker <bernha...@vr-web.de>
+Bug-Debian: https://bugs.debian.org/771671
+Last-Update: <2014-12-15>
+
+--- kexec-tools-2.0.7.orig/kexec/arch/i386/crashdump-x86.c
++++ kexec-tools-2.0.7/kexec/arch/i386/crashdump-x86.c
+@@ -1041,8 +1041,8 @@ int get_max_crash_kernel_limit(uint64_t
+ 
+ static int crashkernel_mem_callback(void *UNUSED(data), int nr,
+                                           char *UNUSED(str),
+-                                          unsigned long base,
+-                                          unsigned long length)
++                                          unsigned long long base,
++                                          unsigned long long length)
+ {
+ 	if (nr >= CRASH_RESERVED_MEM_NR)
+ 		return 1;
+--- kexec-tools-2.0.7.orig/kexec/arch/sh/crashdump-sh.c
++++ kexec-tools-2.0.7/kexec/arch/sh/crashdump-sh.c
+@@ -34,8 +34,8 @@ static struct memory_range crash_memory_
+ static int crash_sh_range_nr;
+ static int crash_sh_memory_range_callback(void *UNUSED(data), int UNUSED(nr),
+ 					  char *str,
+-					  unsigned long base,
+-					  unsigned long length)
++					  unsigned long long base,
++					  unsigned long long length)
+ {
+ 
+ 	struct memory_range *range = crash_memory_range;
+--- kexec-tools-2.0.7.orig/kexec/arch/sh/kexec-sh.c
++++ kexec-tools-2.0.7/kexec/arch/sh/kexec-sh.c
+@@ -24,8 +24,8 @@ static struct memory_range memory_range[
+ 
+ static int kexec_sh_memory_range_callback(void *UNUSED(data), int nr,
+ 					  char *UNUSED(str),
+-					  unsigned long base,
+-					  unsigned long length)
++					  unsigned long long base,
++					  unsigned long long length)
+ {
+ 	if (nr < MAX_MEMORY_RANGES) {
+ 		memory_range[nr].start = base;
diff -Nru kexec-tools-2.0.7/debian/patches/series kexec-tools-2.0.7/debian/patches/series
--- kexec-tools-2.0.7/debian/patches/series	2014-07-25 18:31:19.000000000 +0200
+++ kexec-tools-2.0.7/debian/patches/series	2015-04-22 12:07:00.000000000 +0200
@@ -6,3 +6,4 @@
 linker-option.patch
 const_string_warning.patch
 powerpcspe_support.patch
+fix-callback-functions-given-to-kexec_iomem_for_each_line.patch

Reply via email to