Merge lp:~louis/ubuntu/precise/kexec-tools/lp988512-no-vmcoreinfo into lp:ubuntu/quantal/kexec-tools

Proposed by Louis Bouchard
Status: Merged
Merged at revision: 51
Proposed branch: lp:~louis/ubuntu/precise/kexec-tools/lp988512-no-vmcoreinfo
Merge into: lp:ubuntu/quantal/kexec-tools
Diff against target: 73 lines (+12/-8) (has conflicts)
3 files modified
debian/changelog (+10/-0)
debian/kdump.init.d (+1/-2)
debian/kdump.initramfs (+1/-6)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~louis/ubuntu/precise/kexec-tools/lp988512-no-vmcoreinfo
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+112086@code.launchpad.net

Description of the change

Removal of references to vmcoreinfo, no longer needed after kernel 2.6.24 and not being generated in latest 3.2 kernels due to a bug in makedumpfile

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

The discussion in bug 988512 looks like the kernel team rather wants to change the kernel to produce a vmcoreinfo file again? This would make this MP obsolete. I set it to "work in progress" for now to drop it from the sponsoring queue. Please set to "needs review" if it turns out that it should actually be uploaded, or delete it if it is not relevant any more. Thanks!

review: Needs Information
Revision history for this message
Martin Pitt (pitti) wrote :

As discussed by mail, we should go ahead with this.

review: Approve
51. By Louis Bouchard

Added changelog entry

52. By Louis Bouchard

fixed changelog error

Revision history for this message
Adam Stokes (adam-stokes) wrote :

1 === modified file 'debian/changelog'
2 --- debian/changelog 2012-07-17 10:50:17 +0000
3 +++ debian/changelog 2012-08-14 15:26:39 +0000
4 @@ -1,3 +1,4 @@
5 +<<<<<<< TREE
6 kexec-tools (1:2.0.3-1ubuntu1) quantal; urgency=low
7
8 * Merge from Debian (LP: #1020965); remaining changes:
9 @@ -24,6 +25,15 @@
10
11 -- Khalid Aziz <email address hidden> Tue, 31 Jan 2012 09:11:31 -0700
12
13 +=======
14 +kexec-tools (1:2.0.2-3ubuntu4.1) precise-proposed; urgency=low
15 +
16 + * Removed dependency to vmcoreinfo which is no longer required
17 + and no longer part of the kernel package
18 +
19 + -- Louis Bouchard <email address hidden> Tue, 14 Aug 2012 17:14:30 +0200
20 +
21 +>>>>>>> MERGE-SOURCE

That portion of the diff needs to be fixed as it looks like a merge conflict

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-07-17 10:50:17 +0000
3+++ debian/changelog 2012-08-14 15:26:39 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 kexec-tools (1:2.0.3-1ubuntu1) quantal; urgency=low
7
8 * Merge from Debian (LP: #1020965); remaining changes:
9@@ -24,6 +25,15 @@
10
11 -- Khalid Aziz <khalid@debian.org> Tue, 31 Jan 2012 09:11:31 -0700
12
13+=======
14+kexec-tools (1:2.0.2-3ubuntu4.1) precise-proposed; urgency=low
15+
16+ * Removed dependency to vmcoreinfo which is no longer required
17+ and no longer part of the kernel package
18+
19+ -- Louis Bouchard <louis.bouchard@canonical.com> Tue, 14 Aug 2012 17:14:30 +0200
20+
21+>>>>>>> MERGE-SOURCE
22 kexec-tools (1:2.0.2-3ubuntu4) precise; urgency=low
23
24 * Build kexec-tools-udeb for armhf as well.
25
26=== modified file 'debian/kdump.init.d'
27--- debian/kdump.init.d 2009-06-23 10:59:14 +0000
28+++ debian/kdump.init.d 2012-08-14 15:26:39 +0000
29@@ -18,11 +18,10 @@
30 KVER="`uname -r`"
31 KERNEL_IMAGE="/boot/vmlinuz-$KVER"
32 INITRD="/boot/initrd.img-$KVER"
33-VMCORE="/boot/vmcoreinfo-$KVER"
34
35 # Without makedumpfile, there will be no vmcore on crash, so no point
36 test -x /usr/bin/makedumpfile || exit 0
37-if [ ! -e "$VMCORE" -o ! -e "$KERNEL_IMAGE" -o ! -e "$INITRD" ]; then
38+if [ ! -e "$KERNEL_IMAGE" -o ! -e "$INITRD" ]; then
39 exit 0;
40 fi
41
42
43=== modified file 'debian/kdump.initramfs'
44--- debian/kdump.initramfs 2012-01-03 10:24:16 +0000
45+++ debian/kdump.initramfs 2012-08-14 15:26:39 +0000
46@@ -14,7 +14,6 @@
47 esac
48
49 KVER="`uname -r`"
50-INFO="/boot/vmcoreinfo-$KVER"
51 CRASHFILE="/var/crash/vmcore"
52 MAKEDUMPFILE="/usr/bin/makedumpfile"
53 LOG="$rootmnt/var/crash/vmcore.log"
54@@ -50,10 +49,6 @@
55 done
56
57 # Make sure makedumpfile assumptions are satisfied.
58-while ! test -e "$rootmnt/$INFO"; do
59- panic "kdump: Missing $INFO"
60-done
61-
62 while ! test -x "$rootmnt/$MAKEDUMPFILE"; do
63 panic "kdump: Missing $rootmnt/$MAKEDUMPFILE"
64 done
65@@ -67,7 +62,7 @@
66 # Delete it if the copy fails, mainly to keep from filling up filesystems
67 # by accident.
68 #
69-chroot $rootmnt $MAKEDUMPFILE -E -d 31 -i $INFO $VMCORE $CRASHFILE > $LOG 2>&1 || \
70+chroot $rootmnt $MAKEDUMPFILE -E -d 31 $VMCORE $CRASHFILE > $LOG 2>&1 || \
71 rm -f $rootmnt/$CRASHFILE
72
73 chmod 400 $rootmnt/$CRASHFILE

Subscribers

People subscribed via source and target branches