Control: tags -1 pending
On Wed, 21 Feb 2024 18:04:17 +0100 Helmut Grohne <hel...@subdivi.de>
wrote:
> Package: live-build
> Versrion: 1:20230502
> User: helm...@debian.org
> Usertags: dep17p3
> Tags: patch
>
> /bin/hostname and /sbin/start-stop-daemon are being moved from / to
/usr
> in trixie. Hence, these diversions become ineffective. Temporarily
add
> both diversions to handle both variants.
> ---
> scripts/build/chroot_dpkg | 15 ++++++++++++---
> scripts/build/chroot_hostname | 17 +++++++++++++----
> 2 files changed, 25 insertions(+), 7 deletions(-)
>
> I note that while live-build has MRs on salsa, I cannot seem to create
> one. Hence sending a patch via bugs.d.o.
>
> diff --git a/scripts/build/chroot_dpkg b/scripts/build/chroot_dpkg
> index c43c0eb01..d64820f72 100755
> --- a/scripts/build/chroot_dpkg
> +++ b/scripts/build/chroot_dpkg
> @@ -38,8 +38,14 @@ case "${_ACTION}" in
> Acquire_lockfile
>
> # Create custom start-stop-daemon program
> - Chroot chroot dpkg-divert --rename --quiet --add
> /sbin/start-stop-daemon
> - ln -fs /bin/true chroot/sbin/start-stop-daemon
> + Chroot chroot dpkg-divert --rename --quiet --add
> /usr/sbin/start-stop-daemon
> + # begin-remove-after: released:trixie
> + # In the bookworm to trixie upgrade, dpkg moves
> + # start-stop-daemon from /sbin to /usr/sbin. Duplicate the
> + # diversion to cover both. DEP17 P3 M18
> + Chroot chroot dpkg-divert --rename --quiet --add --divert
> /sbin/start-stop-daemon.distrib.usr-is-mergedThis is missing the second positional parameter (/sbin/start-stop- daemon), but after fixing that it seems to work, so I'll upload a fixed version shortly -- Kind regards, Luca Boccassi
signature.asc
Description: This is a digitally signed message part
