Bug#970213: systemd: kernel/install.d/85-initrd.install: Please don't duplicate initrd in ESP when an explicit one was passed

[наб]

Package: systemd
Version: 246.4-1
Severity: wishlist
Tags: patch

Dear Maintainer,

kernel/install.d/85-initrd.install installs /boot/initrd.img-$VER
to ESP/$MID/$VER/initrd unconditionally, even when an explicit path was
passed.

However, upstream's 90-loaderentry.install already does this,
and installs the initrds it gets to their basenames under ESP/$MID/$VER/

This means, that by default, when running
  kernel-install add $(uname -r) /boot/vmlinuz-$(uname -r) /boot/initrd.img-$(uname -r)
a new installation produced
  /boot/efi/62dd03a4928c412180b3024ac6c03a90/5.8.0-1-amd64/linux
  /boot/efi/62dd03a4928c412180b3024ac6c03a90/5.8.0-1-amd64/initrd
  /boot/efi/62dd03a4928c412180b3024ac6c03a90/5.8.0-1-amd64/initrd.img-5.8.0-1-amd64
with a configuration pointing to the latter initrd,
this is wasteful at best and confusing at worst.

This doesn't break the case of no initrd being specified,
since 90-loaderentry.install falls back to ESP/$MID/$VER/initrd,
and that's the point of this.

Attached is patch for this and another one to match the installation
process and (partially) messages to 90-loaderentry.install's.

Best,
наб

-- Package-specific info:

-- System Information:
Debian Release: bullseye/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 5.7.0-3-686-pae (SMP w/2 CPU threads)
Kernel taint flags: TAINT_WARN
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages systemd depends on:
ii  adduser                          3.118
ii  libacl1                          2.2.53-8
ii  libapparmor1                     2.13.4-3
ii  libaudit1                        1:2.8.5-3+b1
ii  libblkid1                        2.36-3
ii  libc6                            2.31-3
ii  libcap2                          1:2.43-1
ii  libcrypt1                        1:4.4.17-1
ii  libcryptsetup12                  2:2.3.4-1
ii  libgcrypt20                      1.8.6-2
ii  libgnutls30                      3.6.14-2+b1
ii  libgpg-error0                    1.38-2
ii  libidn2-0                        2.3.0-1
ii  libip4tc2                        1.8.5-3
ii  libkmod2                         27+20200310-2
ii  liblz4-1                         1.9.2-2
ii  liblzma5                         5.2.4-1+b1
ii  libmount1                        2.36-3
ii  libpam0g                         1.3.1-5
ii  libpcre2-8-0                     10.34-7
ii  libseccomp2                      2.4.3-1+b1
ii  libselinux1                      3.1-2
ii  libsystemd0                      246.4-1
ii  libzstd1                         1.4.5+dfsg-4
ii  mount                            2.36-3
ii  systemd-timesyncd [time-daemon]  246.4-1
ii  util-linux                       2.36-3

Versions of packages systemd recommends:
ii  dbus  1.12.20-1

Versions of packages systemd suggests:
ii  policykit-1        0.105-29
ii  systemd-container  246.4-1

Versions of packages systemd is related to:
ii  dracut           050+65-1
pn  initramfs-tools  <none>
ii  libnss-systemd   246.4-1
ii  libpam-systemd   246.4-1
ii  udev             246.4-1

-- Configuration Files:
/etc/systemd/journald.conf changed [not included]
/etc/systemd/logind.conf changed [not included]
/etc/systemd/sleep.conf changed [not included]

-- no debconf information
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-debian-extra-kernel-install.d-85-initrd.install-Don-.patch
Type: text/x-diff
Size: 1053 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-systemd-maintainers/attachments/20200913/f4274863/attachment-0002.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-debian-extra-kernel-install.d-85-initrd.install-matc.patch
Type: text/x-diff
Size: 1485 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-systemd-maintainers/attachments/20200913/f4274863/attachment-0003.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-systemd-maintainers/attachments/20200913/f4274863/attachment-0001.sig>