Merge ~rafaeldtinoco/ubuntu/+source/initramfs-tools:lp1863261-focal into ubuntu/+source/initramfs-tools:ubuntu/focal-devel

[Rafael David Tinoco]

BUG: https://bugs.launchpad.net/ubuntu/+source/initramfs-tools/+bug/1863261
PPA: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1863261

[Rafael David Tinoco (rafaeldtinoco)]

I discovered this while handling focal -proposed images. I spoke to cascardo and he was able to reproduce using kmod package from -proposed as well. If cascard isn't able to +1 this, and you are canonical-server, could you please give it a try ? A simple KVM guest using updated (-proposed) will reproduce the issue described in BUG: #1863261.

Thanks!

[Thadeu Lima de Souza Cascardo (cascardo)]

I tested it and it does silence the warnings. It should not cause any regression from the previous situation, as far as I understand, so +1 from me.

review: Approve

[Bryce Harrington (bryce)]

LGTM, +1

Change matches what is being recommended on the upstream bug report.

I was unable to reproduce the problem in a KVM guest, I spent some time on it but was just a rat hole. I was able to reproduce it on multipass though:

depmod: ERROR: ../libkmod/libkmod.c:515 lookup_builtin_file() could not open builtin file '/var/tmp/mkinitramfs_X5qBHs/lib/modules/5.4.0-12-generic/modules.builtin.bin'
depmod: ERROR: ../libkmod/libkmod.c:515 lookup_builtin_file() could not open builtin file '/var/tmp/mkinitramfs_X5qBHs/lib/modules/5.4.0-12-generic/modules.builtin.bin'
root@logical-whistler:/home/ubuntu#

Then, after installing the PPA:

Processing triggers for initramfs-tools (0.133ubuntu15) ...
update-initramfs: Generating /boot/initrd.img-5.4.0-12-generic
root@logical-whistler:/home/ubuntu# update-initramfs -u
update-initramfs: Generating /boot/initrd.img-5.4.0-12-generic
root@logical-whistler:/home/ubuntu#

review: Approve

[Rafael David Tinoco (rafaeldtinoco)]

Thank you @carcardo and @bryce...

Pushed tag and uploaded source package:

rafaeldtinoco@workstation:~/.../initramfs-tools$ git push pkg upload/0.133ubuntu15
Enumerating objects: 12, done.
Counting objects: 100% (12/12), done.
Delta compression using up to 8 threads
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 1.17 KiB | 85.00 KiB/s, done.
Total 8 (delta 5), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/initramfs-tools
 * [new tag] upload/0.133ubuntu15 -> upload/0.133ubuntu15

rafaeldtinoco@workstation:~/.../ubuntu$ dput ubuntu initramfs-tools_0.133ubuntu15_source.changes
Checking signature on .changes
gpg: /home/rafaeldtinoco/work/sources/ubuntu/initramfs-tools_0.133ubuntu15_source.changes: Valid signature from A93E0E0AD83C0D0F
Checking signature on .dsc
gpg: /home/rafaeldtinoco/work/sources/ubuntu/initramfs-tools_0.133ubuntu15.dsc: Valid signature from A93E0E0AD83C0D0F
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading initramfs-tools_0.133ubuntu15.dsc: done.
  Uploading initramfs-tools_0.133ubuntu15.tar.xz: done.
  Uploading initramfs-tools_0.133ubuntu15_source.buildinfo: done.
  Uploading initramfs-tools_0.133ubuntu15_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 14f7bf3..4b6d951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+initramfs-tools (0.133ubuntu15) focal; urgency=medium
+
+  * mkinitramfs: Copy modules.builtin.bin into initramfs (LP: #1863261)
+
+ -- Rafael David Tinoco <[e-mail]>  Fri, 14 Feb 2020 15:05:29 +0000
+
 initramfs-tools (0.133ubuntu14) focal; urgency=medium
 
   * Handle both libgcc1 and libgcc-s1 locations.
diff --git a/mkinitramfs b/mkinitramfs
index cb7b279..aa9471a 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -269,7 +269,9 @@ for d in conf/conf.d etc run scripts ${MODULESDIR}; do
 done
 
 # Copy in modules.builtin and modules.order (not generated by depmod)
-for x in modules.builtin modules.order; do
+# and modules.builtin.bin (generated by depmod, but too late to avoid
+# error messages as in #948257)
+for x in modules.builtin modules.builtin.bin modules.order; do
 	if [ -f "${MODULESDIR}/${x}" ]; then
 		cp -p "${MODULESDIR}/${x}" "${DESTDIR}${MODULESDIR}/${x}"
 	fi