Merge ~tdaitx/ubuntu/+source/initramfs-tools:xenial-sru-lp-1667512-lp-1791959 into ubuntu/+source/initramfs-tools:ubuntu/xenial-updates

Proposed by Tiago Stürmer Daitx on 2018-09-18
Status: Merged
Merge reported by: Andreas Hasenack
Merged at revision: 6b09b7dcd23e3a747865704b6d730f1a7ed42b15
Proposed branch: ~tdaitx/ubuntu/+source/initramfs-tools:xenial-sru-lp-1667512-lp-1791959
Merge into: ubuntu/+source/initramfs-tools:ubuntu/xenial-updates
Diff against target: 72 lines (+31/-2)
4 files modified
debian/changelog (+12/-0)
debian/control (+1/-1)
debian/initramfs-tools.postinst (+17/-0)
update-initramfs (+1/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) 2018-09-18 Approve on 2018-10-08
Mathieu Trudel-Lapierre (community) 2018-09-18 Approve on 2018-09-18
Review via email: mp+355190@code.launchpad.net

Description of the change

Merge proposal for a Xenial SRU fixing bug 1667512 and bug 1791959.

To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

lgtm.

review: Approve
Colin Watson (cjwatson) :
review: Approve
Andreas Hasenack (ahasenack) wrote :

This was merged already, marking as so. The MP wasn't automatically set to merged because the upload tag for git ubuntu wasn't pushed, something that still needs work on the git-ubuntu side.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 6f25826..c475181 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,15 @@
6+initramfs-tools (0.122ubuntu8.13) xenial; urgency=medium
7+
8+ [ Colin Watson ]
9+ * [b4804dd] Only sync the filesystem containing the initramfs
10+ (Closes: #882380) (LP: #1667512)
11+
12+ [ Tiago Stürmer Daitx ]
13+ * debian/initramfs-tools.postinst: remove orphaned old-dkms initrd files
14+ in /boot. (LP: #1791959)
15+
16+ -- Tiago Stürmer Daitx <tiago.daitx@ubuntu.com> Tue, 18 Sep 2018 09:18:47 +0000
17+
18 initramfs-tools (0.122ubuntu8.12) xenial; urgency=medium
19
20 [ Scott Moser ]
21diff --git a/debian/control b/debian/control
22index 2a131f3..c2ce8e1 100644
23--- a/debian/control
24+++ b/debian/control
25@@ -28,7 +28,7 @@ Package: initramfs-tools-core
26 Architecture: all
27 Multi-Arch: foreign
28 Recommends: busybox (>= 1:1.01-3) | busybox-initramfs | busybox-static
29-Depends: initramfs-tools-bin (= ${binary:Version}), busybox-initramfs (>= 1:1.13.3-1ubuntu5), klibc-utils (>= 2.0.4-7~), cpio, kmod | module-init-tools, udev, ${misc:Depends}, klibc-utils (>= 2.0.4-1.2~) | busybox (>= 1:1.01-3) | busybox-initramfs | busybox-static
30+Depends: initramfs-tools-bin (= ${binary:Version}), busybox-initramfs (>= 1:1.13.3-1ubuntu5), klibc-utils (>= 2.0.4-7~), cpio, kmod | module-init-tools, udev, ${misc:Depends}, klibc-utils (>= 2.0.4-1.2~) | busybox (>= 1:1.01-3) | busybox-initramfs | busybox-static, coreutils (>= 8.24)
31 Suggests: bash-completion
32 Breaks: initramfs-tools (<< 0.121~)
33 Replaces: initramfs-tools (<< 0.121~)
34diff --git a/debian/initramfs-tools.postinst b/debian/initramfs-tools.postinst
35index 7b7a789..7fdd709 100644
36--- a/debian/initramfs-tools.postinst
37+++ b/debian/initramfs-tools.postinst
38@@ -11,4 +11,21 @@ else
39 DPKG_MAINTSCRIPT_PACKAGE='' update-initramfs -u
40 fi
41
42+# Remove all initrd old dkms files for which there is no
43+# corresponding initram image in /boot (LP: #1791959).
44+# One shot only:
45+# - bug only affected users that were upgrading packages
46+# - new users are not affected
47+# - LP: #1515513 took care of removing old dkms together with the kernel
48+if [ "x$1" = xconfigure ] && [ -n "$2" ] && dpkg --compare-versions "$2" lt "0.122ubuntu8.13"; then
49+ for old_dkms_file in /boot/initrd-*.img.old-dkms \
50+ /boot/initramfs-*.img.old-dkms \
51+ /boot/initrd.img-*.old-dkms \
52+ /boot/initrd-*.old-dkms; do
53+ if [ ! -e "${old_dkms_file%%.old-dkms}" ]; then
54+ rm -fv "${old_dkms_file}"
55+ fi
56+ done
57+fi
58+
59 #DEBHELPER#
60diff --git a/update-initramfs b/update-initramfs
61index 6db8ba0..24544cc 100755
62--- a/update-initramfs
63+++ b/update-initramfs
64@@ -173,7 +173,7 @@ generate_initramfs()
65 mv -f "${initramfs}.new" "${initramfs}"
66 set_sha1
67 # Guard against an unclean shutdown
68- sync
69+ sync -f "${initramfs}"
70 else
71 mkinitramfs_return="$?"
72 remove_initramfs_bak

Subscribers

People subscribed via source and target branches