[pve-devel] applied: [PATCH 0/3] adapt to systemd-boot hooks in bookworm

[Thomas Lamprecht <t.lamprecht@proxmox.com>]

Am 21/06/2023 um 16:32 schrieb Stoiko Ivanov:
> This patchset addresses the change of shipping systemd-boot as separate
> binary packge introduced with Debian Bookworm.
> 
> The patches are mostly cosmetic in nature - since they silence warnings,
> which look scary, but don't hurt functionality.
> 
> The second patch should help users who upgrade from 7.X -> 8, as they
> won't have systemd-boot installed automatically - so for them initializing
> new ESPs will not work.
> 
> Adding systemd-boot as Recommends to proxmox-kernel-helper should also
> only help in case someone setup their system on plain Debian, with the
> plan of incorporating proxmox-boot-tool into it later (by partitioning
> accordingly)
> 
> While I tested the patches - some review and consideration, especially
> about potential pitfalls regarding the in place editing of the
> hook-scripts would be very much appreciated!
> 
> Stoiko Ivanov (3):
>   boot-tool: disarm upstream systemd-boot hookscripts
>   proxmox-boot: warn on missing systemd-boot package
>   d/control: add Recommends on systemd-boot
> 
>  debian/control                   |  1 +
>  src/bin/proxmox-boot-tool        |  6 ++++++
>  src/proxmox-boot/zz-proxmox-boot | 23 +++++++++++++++++++++++
>  3 files changed, 30 insertions(+)
> 


applied, with two changes as talked off-list:

- downgraded systemd-boot from recommends to suggests, as otherwise it can
  get pulled in on a lot of systems

- changed the "grep -q "$marker" "$hookfile" && continue" to a if+then to
  avoid that this fails if the marker ins't found and grep exits with non-zero
  as we got `set -e` at the top.

thanks!